From 951fc055e39f28943e4552b823365012f6c1cb61 Mon Sep 17 00:00:00 2001 From: Alexey Kazakov Date: Thu, 13 Dec 2018 15:45:19 -0800 Subject: [PATCH 1/3] Switch build to epel release --- Dockerfile.builder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.builder b/Dockerfile.builder index 34a35d97..660e4233 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -5,8 +5,8 @@ ENV LANG=en_US.utf8 ARG USE_GO_VERSION_FROM_WEBSITE=0 # Some packages might seem weird but they are required by the RVM installer. -RUN yum install epel-release --enablerepo=extras -y \ - && yum --enablerepo=centosplus --enablerepo=epel-testing install -y \ +RUN yum install epel-release -y \ + && yum --enablerepo=centosplus --enablerepo=epel install -y \ findutils \ git \ $(test "$USE_GO_VERSION_FROM_WEBSITE" != 1 && echo "golang") \ From b9b508749661985ef46a59fd3a37915dc46b7772 Mon Sep 17 00:00:00 2001 From: Alexey Kazakov Date: Thu, 13 Dec 2018 16:10:58 -0800 Subject: [PATCH 2/3] Update dep to 0.5.0 --- Dockerfile.builder | 4 ++-- Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile.builder b/Dockerfile.builder index 660e4233..3d9a17c7 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -31,8 +31,8 @@ ENV PATH=$PATH:/usr/local/go/bin 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 \ + curl -L -s https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -o dep \ + echo "1a7bdb0d6c31ecba8b3fd213a1170adf707657123e89dff234871af9e0498be2 dep" > dep-linux-amd64.sha256 \ sha256sum -c dep-linux-amd64.sha256 ENTRYPOINT ["/bin/bash"] diff --git a/Makefile b/Makefile index 01250344..27e049a8 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ GIT_BIN := $(shell command -v $(GIT_BIN_NAME) 2> /dev/null) DEP_BIN_NAME := dep DEP_BIN_DIR := ./tmp/bin DEP_BIN := $(DEP_BIN_DIR)/$(DEP_BIN_NAME) -DEP_VERSION=v0.4.1 +DEP_VERSION=v0.5.0 GO_BIN := $(shell command -v $(GO_BIN_NAME) 2> /dev/null) MINIMOCK_BIN=$(VENDOR_DIR)/github.com/gojuno/minimock/cmd/minimock/minimock DOCKER_COMPOSE_BIN := $(shell command -v $(DOCKER_COMPOSE_BIN_NAME) 2> /dev/null) @@ -272,12 +272,12 @@ $(DEP_BIN): ifeq ($(UNAME_S),Darwin) @curl -L -s https://github.com/golang/dep/releases/download/$(DEP_VERSION)/dep-darwin-amd64 -o $(DEP_BIN) @cd $(DEP_BIN_DIR) && \ - echo "1544afdd4d543574ef8eabed343d683f7211202a65380f8b32035d07ce0c45ef dep" > dep-darwin-amd64.sha256 && \ + echo "b5188a187f98febf711a5318cbfb62fed327809f52a1dcf0e8b8c6b37e1d2849 dep" > dep-darwin-amd64.sha256 && \ shasum -a 256 --check dep-darwin-amd64.sha256 else @curl -L -s https://github.com/golang/dep/releases/download/$(DEP_VERSION)/dep-linux-amd64 -o $(DEP_BIN) @cd $(DEP_BIN_DIR) && \ - echo "31144e465e52ffbc0035248a10ddea61a09bf28b00784fd3fdd9882c8cbb2315 dep" > dep-linux-amd64.sha256 && \ + echo "1a7bdb0d6c31ecba8b3fd213a1170adf707657123e89dff234871af9e0498be2 dep" > dep-linux-amd64.sha256 && \ sha256sum -c dep-linux-amd64.sha256 endif @chmod +x $(DEP_BIN) From 2cca7476ca91fddb7d7d32aa7a6972a8fe8a776d Mon Sep 17 00:00:00 2001 From: Alexey Kazakov Date: Thu, 13 Dec 2018 16:41:29 -0800 Subject: [PATCH 3/3] fix sha --- Dockerfile.builder | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.builder b/Dockerfile.builder index 3d9a17c7..bd9c718c 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -32,7 +32,7 @@ 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.5.0/dep-linux-amd64 -o dep \ - echo "1a7bdb0d6c31ecba8b3fd213a1170adf707657123e89dff234871af9e0498be2 dep" > dep-linux-amd64.sha256 \ + echo "287b08291e14f1fae8ba44374b26a2b12eb941af3497ed0ca649253e21ba2f83 dep" > dep-linux-amd64.sha256 \ sha256sum -c dep-linux-amd64.sha256 ENTRYPOINT ["/bin/bash"] diff --git a/Makefile b/Makefile index 27e049a8..8c6bc2b2 100644 --- a/Makefile +++ b/Makefile @@ -272,12 +272,12 @@ $(DEP_BIN): ifeq ($(UNAME_S),Darwin) @curl -L -s https://github.com/golang/dep/releases/download/$(DEP_VERSION)/dep-darwin-amd64 -o $(DEP_BIN) @cd $(DEP_BIN_DIR) && \ - echo "b5188a187f98febf711a5318cbfb62fed327809f52a1dcf0e8b8c6b37e1d2849 dep" > dep-darwin-amd64.sha256 && \ + echo "1a7bdb0d6c31ecba8b3fd213a1170adf707657123e89dff234871af9e0498be2 dep" > dep-darwin-amd64.sha256 && \ shasum -a 256 --check dep-darwin-amd64.sha256 else @curl -L -s https://github.com/golang/dep/releases/download/$(DEP_VERSION)/dep-linux-amd64 -o $(DEP_BIN) @cd $(DEP_BIN_DIR) && \ - echo "1a7bdb0d6c31ecba8b3fd213a1170adf707657123e89dff234871af9e0498be2 dep" > dep-linux-amd64.sha256 && \ + echo "287b08291e14f1fae8ba44374b26a2b12eb941af3497ed0ca649253e21ba2f83 dep" > dep-linux-amd64.sha256 && \ sha256sum -c dep-linux-amd64.sha256 endif @chmod +x $(DEP_BIN)