diff --git a/README.md b/README.md index 9b4a3aaf..889151e1 100644 --- a/README.md +++ b/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 contrib/Dockerfile . -t engelsystem +docker build -f docker/nginx/Dockerfile . -t engelsystem-nginx +docker build -f docker/Dockerfile . -t engelsystem ``` Import database diff --git a/contrib/.env b/docker/.env similarity index 100% rename from contrib/.env rename to docker/.env diff --git a/contrib/Dockerfile b/docker/Dockerfile similarity index 100% rename from contrib/Dockerfile rename to docker/Dockerfile diff --git a/contrib/docker-compose.yml b/docker/docker-compose.yml similarity index 91% rename from contrib/docker-compose.yml rename to docker/docker-compose.yml index 4624cce4..f4be4eb2 100644 --- a/contrib/docker-compose.yml +++ b/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 diff --git a/contrib/nginx/Dockerfile b/docker/nginx/Dockerfile similarity index 86% rename from contrib/nginx/Dockerfile rename to docker/nginx/Dockerfile index 9f5dcb3b..47b3d50e 100644 --- a/contrib/nginx/Dockerfile +++ b/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/ diff --git a/contrib/nginx/nginx.conf b/docker/nginx/nginx.conf similarity index 100% rename from contrib/nginx/nginx.conf rename to docker/nginx/nginx.conf