diff options
| author | Michael Weimann <mail@michael-weimann.eu> | 2019-10-14 22:23:52 +0200 |
|---|---|---|
| committer | Michael Weimann <mail@michael-weimann.eu> | 2019-10-24 22:09:14 +0200 |
| commit | 53ce83a272c636c4eccd043f16215d7475a2d8a9 (patch) | |
| tree | 51e00aa0c768ea5b60a335b97ac64deb75517276 | |
| parent | 9b08b951a2f7036519a9711ff4aa32a8709e261d (diff) | |
Moves docker files from contrib to docker
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | docker/.env (renamed from contrib/.env) | 0 | ||||
| -rw-r--r-- | docker/Dockerfile (renamed from contrib/Dockerfile) | 0 | ||||
| -rw-r--r-- | docker/docker-compose.yml (renamed from contrib/docker-compose.yml) | 4 | ||||
| -rw-r--r-- | docker/nginx/Dockerfile (renamed from contrib/nginx/Dockerfile) | 2 | ||||
| -rw-r--r-- | docker/nginx/nginx.conf (renamed from contrib/nginx/nginx.conf) | 0 |
6 files changed, 6 insertions, 6 deletions
@@ -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 index 5f8d43b8..5f8d43b8 100644 --- a/contrib/.env +++ b/docker/.env diff --git a/contrib/Dockerfile b/docker/Dockerfile index 013ccf1d..013ccf1d 100644 --- a/contrib/Dockerfile +++ b/docker/Dockerfile diff --git a/contrib/docker-compose.yml b/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 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 index d95c18e2..d95c18e2 100644 --- a/contrib/nginx/nginx.conf +++ b/docker/nginx/nginx.conf |