diff --git a/Dockerfile.builder b/Dockerfile.builder index 7a648d1..daae229 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") \ diff --git a/Makefile b/Makefile index c0a8144..fd1b4d9 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ endif GIT_BIN := $(shell command -v $(GIT_BIN_NAME) 2> /dev/null) DEP_BIN_DIR := $(TMP_PATH)/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) DOCKER_BIN := $(shell command -v $(DOCKER_BIN_NAME) 2> /dev/null) @@ -143,12 +143,12 @@ 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) && \ curl -L -s https://github.com/golang/dep/releases/download/$(DEP_VERSION)/dep-darwin-amd64.sha256 -o $(DEP_BIN_DIR)/dep-darwin-amd64.sha256 && \ - echo "1544afdd4d543574ef8eabed343d683f7211202a65380f8b32035d07ce0c45ef 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 "31144e465e52ffbc0035248a10ddea61a09bf28b00784fd3fdd9882c8cbb2315 dep" > checksum && \ + echo "287b08291e14f1fae8ba44374b26a2b12eb941af3497ed0ca649253e21ba2f83 dep" > checksum && \ sha256sum -c checksum endif @chmod +x $(DEP_BIN)