Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

Commit

Permalink
Migrate from glide to dep (#449)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeykazakov authored and sbose78 committed Apr 18, 2018
1 parent 628df12 commit 5fc4a9c
Show file tree
Hide file tree
Showing 10 changed files with 610 additions and 412 deletions.
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
vendor
tmp
*.test
.git
2 changes: 1 addition & 1 deletion .make/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ PACKAGE_PATH=$(GOPATH_IN_CONTAINER)/src/$(PACKAGE_NAME)
## Builds the docker image used to build the software.
docker-image-builder:
@echo "Building docker image $(DOCKER_IMAGE_CORE)"
docker build --quiet --build-arg USE_GO_VERSION_FROM_WEBSITE=$(USE_GO_VERSION_FROM_WEBSITE) -t $(DOCKER_IMAGE_CORE) -f $(CUR_DIR)/Dockerfile.builder $(CUR_DIR)
docker build --build-arg USE_GO_VERSION_FROM_WEBSITE=$(USE_GO_VERSION_FROM_WEBSITE) -t $(DOCKER_IMAGE_CORE) -f $(CUR_DIR)/Dockerfile.builder $(CUR_DIR)

.PHONY: docker-image-deploy
## Creates a runnable image using the artifacts from the bin directory.
Expand Down
13 changes: 7 additions & 6 deletions Dockerfile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ RUN test -n $USE_GO_VERSION_FROM_WEBSITE \
&& rm -f go1.10.linux-amd64.tar.gz
ENV PATH=$PATH:/usr/local/go/bin

# Get glide for Go package management
RUN cd /tmp \
&& wget https://github.com/Masterminds/glide/releases/download/v0.13.1/glide-v0.13.1-linux-amd64.tar.gz \
&& tar xzf glide-v*.tar.gz \
&& mv linux-amd64/glide /usr/bin \
&& rm -rfv glide-v* linux-amd64
# Get dep for Go package management and make sure the directory has full rwz permissions for non-root users
ENV GOPATH /tmp/go
RUN mkdir -p $GOPATH/bin && chmod a+rwx $GOPATH
RUN cd $GOPATH/bin \
curl -L -s https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 -o dep \
echo "31144e465e52ffbc0035248a10ddea61a09bf28b00784fd3fdd9882c8cbb2315 dep" > dep-linux-amd64.sha256 \
sha256sum -c dep-linux-amd64.sha256

ENTRYPOINT ["/bin/bash"]
Loading

0 comments on commit 5fc4a9c

Please sign in to comment.