From 9591c062e3adb2cff7cdaeafb37b095fbe32fd78 Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 20 Jun 2016 22:12:41 +0800 Subject: [PATCH] update nginx --- nginx/Dockerfile | 7 ++----- nginx/arm/Dockerfile | 13 +++++++++++++ nginx/arm/docker-compose.yml | 8 ++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 nginx/arm/Dockerfile create mode 100644 nginx/arm/docker-compose.yml diff --git a/nginx/Dockerfile b/nginx/Dockerfile index af7c700..3c15e15 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -3,13 +3,10 @@ # FROM alpine + MAINTAINER kev -RUN set -xe \ - && apk add -U nginx \ - && rm -rf /var/cache/apk/* - -VOLUME /usr/share/nginx/html +RUN apk add --no-cache nginx EXPOSE 80 diff --git a/nginx/arm/Dockerfile b/nginx/arm/Dockerfile new file mode 100644 index 0000000..eed5cba --- /dev/null +++ b/nginx/arm/Dockerfile @@ -0,0 +1,13 @@ +# +# Dockerfile for nginx-arm +# + +FROM easypi/alpine-arm + +MAINTAINER EasyPi Software Foundation + +RUN apk add --no-cache nginx + +EXPOSE 80 + +CMD ["nginx", "-g", "daemon off;"] diff --git a/nginx/arm/docker-compose.yml b/nginx/arm/docker-compose.yml new file mode 100644 index 0000000..8382371 --- /dev/null +++ b/nginx/arm/docker-compose.yml @@ -0,0 +1,8 @@ +nginx: + image: easypi/nginx-arm + ports: + - "80:80" + volumes: + - ./nginx/nginx.conf:/etc/nginx/nginx.conf + - ./html:/usr/share/nginx/html + restart: always