Moves docker files from contrib to docker

README.md

@@ -117,14 +117,14 @@ PRODUCTION_REMOTE_PATH  # Same as STAGING_REMOTE_PATH but for the production env
 ### Docker container
 To build the `engelsystem` and the `engelsystem-nginx` container:
 ```bash
-cd contrib
+cd docker
 docker-compose build
 ```
 
 or to build the containers separately
 ```bash
-docker build -f contrib/nginx/Dockerfile . -t engelsystem-nginx
+docker build -f docker/nginx/Dockerfile . -t engelsystem-nginx
-docker build -f contrib/Dockerfile . -t engelsystem
+docker build -f docker/Dockerfile . -t engelsystem
 ```
 
 Import database

docker/docker-compose.yml

@@ -4,7 +4,7 @@ services:
     image: engelsystem-nginx
     build:
       context: ..
-      dockerfile: contrib/nginx/Dockerfile
+      dockerfile: ""
     ports:
       - 5000:80
     networks:
@@ -15,7 +15,7 @@ services:
     image: engelsystem
     build:
       context: ..
-      dockerfile: contrib/Dockerfile
+      dockerfile: ""
     environment:
       MYSQL_HOST: database
       MYSQL_USER: engelsystem

docker/nginx/Dockerfile

@@ -7,5 +7,5 @@ RUN yarn build
 
 FROM nginx:alpine
 RUN mkdir -p /var/www/public/ && touch /var/www/public/index.php
-COPY contrib/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY --from=themes /app/public/assets /var/www/public/assets/