moved docker-compose files into utils/docker

fossar · Feb 16, 2020 · 45aac1c · 45aac1c
1 parent 675ed0a
commit 45aac1c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/.env.dist → utils/docker/.env.dist b/.env.dist → utils/docker/.env.dist
diff --git a/utils/docker/Dockerfile.dev b/utils/docker/Dockerfile.dev
@@ -20,8 +20,7 @@ RUN curl -o /tmp/composer-setup.php "https://getcomposer.org/installer"; \
     && groupadd --gid ${gid} node \
     && useradd --uid ${uid} --gid node --shell /bin/bash --create-home node
 
-ENV APACHE_RUN_USER=node
-ENV APACHE_RUN_GROUP=node
+ENV APACHE_RUN_USER=node APACHE_RUN_GROUP=node
 
 VOLUME /var/www/html/
 

diff --git a/utils/docker/Readme.md b/utils/docker/Readme.md
@@ -2,7 +2,9 @@
 
 There are two Dockerfiles bundled in the repository - one for development, one for production deployment.
 
-To build the production container use:
+### Production
+
+To build the production container first go to utils/docker directory, then use:
 ```
 docker-compose build --no-cache --pull
 ```
@@ -16,7 +18,9 @@ Selfoss web interface will be available at http://localhost:8390
 
 Selfoss config is mounted in a separate volume, so your custom settings should survive reboot.
 
-To run the development container first copy .env.dist into .env and make sure the UID and GID matches your own user and group ID, otherwise the dev scripts will create files with wrong access rights.
+### Development
+
+To run the development container first make sure you are in utils/docker directory, then copy .env.dist into .env and make sure the UID and GID matches your own user and group ID, otherwise the dev scripts will create files with wrong access rights.
 ```
 cat .env.dist | sed 's/UID=1000/UID='$(id -u)'/' | sed 's/GID=1000/GID='$(id -g)'/' > .env
 ```

diff --git a/docker-compose.dev.yml → utils/docker/docker-compose.dev.yml b/docker-compose.dev.yml → utils/docker/docker-compose.dev.yml
@@ -3,11 +3,12 @@ version: "3"
 services:
   # clean build with `docker-compose -f docker-compose.dev.yml build --no-cache --pull app`
   app:
+    image: selfoss/selfoss-dev
     build:
       args:
         uid: ${UID}
         gid: ${GID}
-      context: .
+      context: ../..
       dockerfile: ./utils/docker/Dockerfile.dev
     volumes:
       - .:/var/www/html/

diff --git a/docker-compose.yml → utils/docker/docker-compose.yml b/docker-compose.yml → utils/docker/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   app:
     image: selfoss/selfoss
     build:
-      context: .
+      context: ../..
       dockerfile: ./utils/docker/Dockerfile
     volumes:
       - config:/var/www/html/config/