Skip to content

Commit

Permalink
Cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
adi90x committed Dec 13, 2016
1 parent 813612f commit 03b6363
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 40 deletions.
3 changes: 1 addition & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.git
.dockerignore
circle.yml
Makefile
README.md
test
.gitlab-ci.yml
16 changes: 0 additions & 16 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
FROM nginx:1.11.6-alpine
MAINTAINER Adrien M [email protected]

# Install wget and install/updates certificates
#RUN apt-get update \
# && apt-get install -y -q --no-install-recommends \
# ca-certificates \
# unzip \
# curl \
# && apt-get clean \
# && rm -r /var/lib/apt/lists/*

RUN apk add --no-cache ca-certificates
RUN apk add --no-cache curl
RUN apk add --no-cache unzip
Expand All @@ -25,20 +16,13 @@ RUN chmod u+x /usr/local/bin/forego

ARG TOKEN_RANCHER_GEN

#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

RUN curl --header "PRIVATE-TOKEN: $TOKEN_RANCHER_GEN" "https://gitlab.com/api/v3/projects/2130165/builds/artifacts/master/download?job=compile-go" > /tmp/rancher-gen-rap.zip \
&& unzip /tmp/rancher-gen-rap.zip -d /usr/local/bin \
&& chmod +x /usr/local/bin/rancher-gen

COPY . /app/
WORKDIR /app/

ENV DOCKER_HOST unix:///tmp/docker.sock

VOLUME ["/etc/nginx/certs"]

#ENTRYPOINT ["/app/docker-entrypoint.sh"]
CMD ["forego", "start", "-r"]
22 changes: 0 additions & 22 deletions docker-entrypoint.sh

This file was deleted.

0 comments on commit 03b6363

Please sign in to comment.