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

Switch build to epel release #82

Merged
merged 1 commit into from
Dec 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -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") \
Expand All @@ -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 "287b08291e14f1fae8ba44374b26a2b12eb941af3497ed0ca649253e21ba2f83 dep" > dep-linux-amd64.sha256 && \
sha256sum -c dep-linux-amd64.sha256 && \
chmod a+x dep
ENV PATH $PATH:$GOPATH/bin
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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_BIN := $(shell command -v $(DEP_BIN_NAME) 2> /dev/null)
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)
Expand Down