diff --git a/docker-compose.yml b/docker-compose.yml index 0bf93018..fcd787fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,13 +47,14 @@ services: nginx: container_name: petstore-nginx hostname: petstore-nginx - build: - dockerfile: ./prod/nginx/Dockerfile - context: ./docker + image: nginx:1.17.8 ports: - '10080:80' - '10443:443' volumes: + - ./docker/prod/nginx/certificate_key:/etc/nginx/certificate_key:ro + - ./docker/prod/nginx/certificate:/etc/nginx/certificate:ro + - ./docker/prod/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - ./:/var/www/html:ro depends_on: - php diff --git a/docker/prod/nginx/Dockerfile b/docker/prod/nginx/Dockerfile deleted file mode 100644 index c512ca40..00000000 --- a/docker/prod/nginx/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM ubuntu:19.10 - -ENV DEBIAN_FRONTEND=noninteractive - -SHELL ["/bin/bash", "-c"] - -RUN apt-get update -y && apt-get install -y \ - gnupg2 \ - locales \ - tzdata - -RUN locale-gen de_CH.UTF-8 && update-locale LANG=de_CH.UTF-8 LC_ALL=de_CH.UTF-8 \ - && cp -f /usr/share/zoneinfo/Europe/Zurich /etc/localtime && dpkg-reconfigure --frontend noninteractive tzdata - -RUN echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu eoan main" > /etc/apt/sources.list.d/nginx-stable.list \ - && apt-key adv --keyserver keys.andreas-puls.de --recv-keys 00A6F0A3C300EE8C - -RUN apt-get update -y && apt-get install -y nginx-light - -COPY prod/nginx/files / - -CMD ["nginx", "-g", "daemon off;"] diff --git a/docker/prod/nginx/files/etc/nginx/certificate b/docker/prod/nginx/certificate similarity index 100% rename from docker/prod/nginx/files/etc/nginx/certificate rename to docker/prod/nginx/certificate diff --git a/docker/prod/nginx/files/etc/nginx/certificate_key b/docker/prod/nginx/certificate_key similarity index 100% rename from docker/prod/nginx/files/etc/nginx/certificate_key rename to docker/prod/nginx/certificate_key diff --git a/docker/prod/nginx/files/etc/nginx/nginx.conf b/docker/prod/nginx/nginx.conf similarity index 100% rename from docker/prod/nginx/files/etc/nginx/nginx.conf rename to docker/prod/nginx/nginx.conf