wip

keevitaja · Oct 23, 2021 · 1d27762 · 1d27762
1 parent 622edb9
commit 1d27762
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 .idea
-
+.env
diff --git a/bin/build b/bin/build
@@ -2,6 +2,4 @@
 
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )
 
-source $DIR/env
-
 docker-compose -f $DIR/../docker-compose.yml up --build
diff --git a/bin/env b/bin/env
diff --git a/bin/root b/bin/root
@@ -2,6 +2,4 @@
 
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )
 
-source $DIR/env
-
 docker exec -it --user root -w /root ${DOCKER_APP_CONTAINER} bash
diff --git a/bin/start b/bin/start
@@ -2,6 +2,4 @@
 
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )
 
-source $DIR/env
-
 docker-compose -f $DIR/../docker-compose.yml up -d
diff --git a/bin/stop b/bin/stop
@@ -2,6 +2,4 @@
 
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )
 
-source $DIR/env
-
 docker-compose -f $DIR/../docker-compose.yml down
diff --git a/bin/user b/bin/user
@@ -2,6 +2,4 @@
 
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )
 
-source $DIR/env
-
 docker exec -it --user ${DOCKER_APP_USERNAME} -w /var/www/html ${DOCKER_APP_CONTAINER} bash
diff --git a/config/docker.env b/config/docker.env
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,6 +3,7 @@ services:
   web:
     container_name: ${DOCKER_APP_CONTAINER}
     restart: always
+    env_file: ./.env
     build:
       context: ./config
       dockerfile: apache.dockerfile
@@ -22,9 +23,6 @@ services:
       - ./..:/var/www/html
       - $HOME/.ssh:/home/user/.ssh
       - ./home:/home/user
-    environment:
-      - APACHE_RUN_USER=#${DOCKER_APP_UID}
-      - APACHE_RUN_GROUP=#${DOCKER_APP_UID}
   mariadb:
     container_name: mariadb-10-4-${DOCKER_APP_NAME}
     restart: always

diff --git a/env.example b/env.example
@@ -0,0 +1,9 @@
+DOCKER_APP_NAME=app
+DOCKER_APP_CONTAINER=apache-8-0-${DOCKER_APP_NAME}
+DOCKER_APP_UID=1000
+DOCKER_APP_GID=1000
+DOCKER_APP_USERNAME=user
+DOCKER_APP_HOSTNAME=app.localhost
+DOCKER_APP_DOCROOT=public
+APACHE_RUN_USER=#${DOCKER_APP_UID}
+APACHE_RUN_GROUP=#${DOCKER_APP_UID}
diff --git a/readme.md b/readme.md
@@ -1,6 +1,8 @@
 # Docker setup for php development (WIP)
 
-Put this repository into your project root and copy config/docker.env to your project root and make changes as needed.
+Put this repository into your project root and copy `env.example` to `.env` and make changes as needed.
+
+You should match UID,GIT,USERNAME to your host machine.
 
 ```
 └── project_root