Use forego from ddollar (upstream)

This commit is contained in:
NZSmartie 2018-02-17 19:47:35 +13:00
parent 226bfe158f
commit 591d07421a
No known key found for this signature in database
GPG key ID: B7E1258B1896B531
3 changed files with 15 additions and 10 deletions

View file

@ -4,3 +4,4 @@ circle.yml
Makefile Makefile
README.md README.md
test test
Dockerfile*

View file

@ -14,15 +14,17 @@ RUN apt-get update \
RUN echo "daemon off;" >> /etc/nginx/nginx.conf \ RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
&& sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf && sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf
ENV DOCKER_PLATFORM amd64
# Install Forego # Install Forego
ADD https://github.com/jwilder/forego/releases/download/v0.16.1/forego /usr/local/bin/forego RUN wget -q -O - https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-$DOCKER_PLATFORM.tgz \
RUN chmod u+x /usr/local/bin/forego | tar -C /usr/local/bin -xvz \
&& chmod u+x /usr/local/bin/forego
ENV DOCKER_GEN_VERSION 0.7.3 ENV DOCKER_GEN_VERSION 0.7.3
RUN wget https://github.com/jwilder/docker-gen/releases/download/$DOCKER_GEN_VERSION/docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \ RUN wget -q -O - https://github.com/jwilder/docker-gen/releases/download/$DOCKER_GEN_VERSION/docker-gen-linux-$DOCKER_PLATFORM-$DOCKER_GEN_VERSION.tar.gz \
&& tar -C /usr/local/bin -xvzf docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \ | tar -C /usr/local/bin -xvz
&& rm /docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz
COPY network_internal.conf /etc/nginx/ COPY network_internal.conf /etc/nginx/

View file

@ -11,15 +11,17 @@ RUN apk add --no-cache --virtual .run-deps \
RUN echo "daemon off;" >> /etc/nginx/nginx.conf \ RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
&& sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf && sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf
ENV DOCKER_PLATFORM amd64
# Install Forego # Install Forego
ADD https://github.com/jwilder/forego/releases/download/v0.16.1/forego /usr/local/bin/forego RUN wget -q -O - https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-$DOCKER_PLATFORM.tgz \
RUN chmod u+x /usr/local/bin/forego | tar -C /usr/local/bin -xvz \
&& chmod u+x /usr/local/bin/forego
ENV DOCKER_GEN_VERSION 0.7.3 ENV DOCKER_GEN_VERSION 0.7.3
RUN wget --quiet https://github.com/jwilder/docker-gen/releases/download/$DOCKER_GEN_VERSION/docker-gen-alpine-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \ RUN wget -q -O - https://github.com/jwilder/docker-gen/releases/download/$DOCKER_GEN_VERSION/docker-gen-alpine-linux-$DOCKER_PLATFORM-$DOCKER_GEN_VERSION.tar.gz \
&& tar -C /usr/local/bin -xvzf docker-gen-alpine-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \ | tar -C /usr/local/bin -xvz
&& rm /docker-gen-alpine-linux-amd64-$DOCKER_GEN_VERSION.tar.gz
COPY . /app/ COPY . /app/
WORKDIR /app/ WORKDIR /app/