diff --git a/Dockerfile b/Dockerfile index d3f29c5..7b77c30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,25 +5,18 @@ MAINTAINER Jason Wilder jwilder@litl.com RUN apt-get update \ && apt-get install -y -q --no-install-recommends \ ca-certificates \ - wget \ && apt-get clean \ && rm -r /var/lib/apt/lists/* -# Configure Nginx and apply fix for long server names -RUN echo "daemon off;" >> /etc/nginx/nginx.conf \ - && sed -i 's/^http {/&\n server_names_hash_bucket_size 64;/g' /etc/nginx/nginx.conf - - # Install Forego -RUN wget -P /usr/local/bin https://godist.herokuapp.com/projects/ddollar/forego/releases/current/linux-amd64/forego \ - && chmod u+x /usr/local/bin/forego +# fix for long server names in Nginx +RUN sed -i 's/^http {/&\n server_names_hash_bucket_size 64;/g' /etc/nginx/nginx.conf ENV DOCKER_GEN_VERSION 0.3.6 -RUN wget https://github.com/jwilder/docker-gen/releases/download/$DOCKER_GEN_VERSION/docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \ - && tar -C /usr/local/bin -xvzf docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \ - && rm /docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz +# Install docker-gen +ADD docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz /usr/local/bin -COPY . /app/ +COPY ./root/ / WORKDIR /app/ ENV DOCKER_HOST unix:///tmp/docker.sock diff --git a/docker-gen-linux-amd64-0.3.6.tar.gz b/docker-gen-linux-amd64-0.3.6.tar.gz new file mode 100644 index 0000000..ac9b05f Binary files /dev/null and b/docker-gen-linux-amd64-0.3.6.tar.gz differ diff --git a/Procfile b/root/app/Procfile similarity index 100% rename from Procfile rename to root/app/Procfile diff --git a/nginx.tmpl b/root/app/nginx.tmpl similarity index 100% rename from nginx.tmpl rename to root/app/nginx.tmpl diff --git a/root/usr/local/bin/forego b/root/usr/local/bin/forego new file mode 100755 index 0000000..d69141f Binary files /dev/null and b/root/usr/local/bin/forego differ