From fc50fd51d501fdda854a168eab6425b1e53e3d67 Mon Sep 17 00:00:00 2001 From: yixingj Date: Fri, 30 Jun 2017 14:03:42 +0800 Subject: [PATCH] Move nginx to photon OS --- make/common/nginx/Dockerfile | 11 +++++++++++ make/docker-compose.tpl | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 make/common/nginx/Dockerfile diff --git a/make/common/nginx/Dockerfile b/make/common/nginx/Dockerfile new file mode 100644 index 000000000..64ab04d3a --- /dev/null +++ b/make/common/nginx/Dockerfile @@ -0,0 +1,11 @@ +FROM library/photon:1.0 + +RUN tdnf install -y nginx \ + && ln -sf /dev/stdout /var/log/nginx/access.log \ + && ln -sf /dev/stderr /var/log/nginx/error.log \ + && mkdir -p /var/run + +EXPOSE 80 +STOPSIGNAL SIGQUIT + +CMD ["nginx", "-g", "daemon off;"] diff --git a/make/docker-compose.tpl b/make/docker-compose.tpl index 22eba44f7..50b122dab 100644 --- a/make/docker-compose.tpl +++ b/make/docker-compose.tpl @@ -109,7 +109,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "jobservice" proxy: - image: vmware/nginx:1.11.5-patched + image: vmware/nginx-photon:1.11.13 container_name: nginx restart: always volumes: