Skip to content

Commit

Permalink
fix: Updating way to retrieve dependencies for golang
Browse files Browse the repository at this point in the history
  • Loading branch information
ViBiOh committed Oct 31, 2020
1 parent 4c49520 commit ed5d46c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ coverage.*
profile.out

# Files
cacert.pem
ca-certificates.crt
zoneinfo.zip
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
script:
- make
- git --no-pager diff -- ':(exclude)go.sum' && git diff --quiet -- ':(exclude)go.sum'
- curl -q -sSL --max-time 30 -o cacert.pem https://curl.haxx.se/ca/cacert.pem
- curl -q -sSL --max-time 30 -o zoneinfo.zip https://raw.githubusercontent.com/golang/go/master/lib/time/zoneinfo.zip
- curl -q -sSL --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/master/bootstrap" | bash -s "release"
- echo "${DOCKER_PASS}" | docker login -u "${DOCKER_USER}" --password-stdin
- DOCKER_IMAGE="${DOCKER_USER}/$(make name)" IMAGE_VERSION="$(make version)" ./scripts/release build docker
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
FROM vibioh/scratch

ENV ZONEINFO zoneinfo.zip
ENV API_PORT 1080
EXPOSE 1080

ENV API_PORT 1080
ENV ZONEINFO /zoneinfo.zip
COPY zoneinfo.zip /zoneinfo.zip
COPY ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

HEALTHCHECK --retries=5 CMD [ "/goweb", "-url", "http://localhost:1080/health" ]
ENTRYPOINT [ "/goweb" ]
Expand All @@ -14,6 +16,4 @@ ENV VERSION=${VERSION}
ARG TARGETOS
ARG TARGETARCH

COPY cacert.pem /etc/ssl/certs/ca-certificates.crt
COPY zoneinfo.zip /
COPY release/goweb_${TARGETOS}_${TARGETARCH} /goweb

0 comments on commit ed5d46c

Please sign in to comment.