From 93f688f8df9241faf685fc73deacf98aeee4cbec Mon Sep 17 00:00:00 2001 From: John Mulhausen Date: Thu, 25 May 2017 14:34:45 -0700 Subject: [PATCH] Update to GH Pages 137; alpine-based --- .gitignore | 9 +++++++++ Dockerfile | 14 +++----------- 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..458e375c79 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +**/.DS_Store +**/desktop.ini +.bundle/** +.jekyll-metadata +_site/** +.sass-cache/** +CNAME +Gemfile.lock +tests/** diff --git a/Dockerfile b/Dockerfile index be3df66fe0..eab93d7b90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,11 @@ -FROM starefossen/github-pages:112 +FROM starefossen/github-pages:137 # This is the source for docs/docs-base. Push to that location to ensure that # the production image gets your update :) # Install nginx -ENV NGINX_VERSION 1.11.9-1~jessie - -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 \ - && echo "deb http://nginx.org/packages/mainline/debian/ jessie nginx" >> /etc/apt/sources.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ca-certificates \ - nginx=${NGINX_VERSION} \ - && rm -rf /var/lib/apt/lists/* +RUN apk add nginx && apk add git # Forward nginx request and error logs to docker log collector @@ -80,4 +72,4 @@ COPY index.html target # Serve the site (target), which is now all static HTML -CMD echo "Docker docs are viewable at:" && echo "http://0.0.0.0:4000" && exec nginx +CMD echo "Docker docs are viewable at:" && echo "http://0.0.0.0:4000" && nginx -g 'pid /tmp/nginx.pid;'