Skip to content

Commit 158a6ac

Browse files
authored
Remove ci-deps and update GOPROXY in Dockerfiles (#2247)
Recent refactoring has changed dependency installation. ci-deps did not appear to be used in a meaningful way, so it was removed from the Makefile and Dockerfiles. Additionally, downloading from go has become unstable, so updating the GOPROXY options should help.
1 parent 42fc19d commit 158a6ac

File tree

6 files changed

+9
-13
lines changed

6 files changed

+9
-13
lines changed

docker/build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WORKDIR /root
66
RUN wget --quiet https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz && tar -xvf go${GOLANG_VERSION}.linux-amd64.tar.gz && mv go /usr/local
77
ENV GOROOT=/usr/local/go \
88
GOPATH=$HOME/go \
9-
GOPROXY=https://pkg.go.dev,https://goproxy.io,direct
9+
GOPROXY=https://proxy.golang.org,https://pkg.go.dev,https://goproxy.io,direct
1010
RUN mkdir -p $GOPATH/src/github.com/algorand
1111
WORKDIR $GOPATH/src/github.com/algorand
1212
COPY ./go-algorand ./go-algorand/

docker/build/Dockerfile-deploy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WORKDIR /root
66
RUN wget --quiet https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz && tar -xvf go${GOLANG_VERSION}.linux-amd64.tar.gz && mv go /usr/local
77
ENV GOROOT=/usr/local/go \
88
GOPATH=$HOME/go \
9-
GOPROXY=https://pkg.go.dev,https://goproxy.io,direct
9+
GOPROXY=https://proxy.golang.org,https://pkg.go.dev,https://goproxy.io,direct
1010
RUN mkdir -p $GOPATH/src/github.com/algorand
1111
WORKDIR $GOPATH/src/github.com/algorand
1212
COPY . ./go-algorand/

docker/build/cicd.alpine.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ RUN apk add dpkg && \
2525
COPY . $GOPATH/src/github.com/algorand/go-algorand
2626
WORKDIR $GOPATH/src/github.com/algorand/go-algorand
2727
ENV GCC_CONFIG="--with-arch=armv6" \
28-
GOPROXY=https://pkg.go.dev,https://goproxy.io,direct
29-
RUN make ci-deps && make clean
28+
GOPROXY=https://proxy.golang.org,https://pkg.go.dev,https://goproxy.io,direct
29+
RUN make clean
3030
RUN rm -rf $GOPATH/src/github.com/algorand/go-algorand && \
3131
mkdir -p $GOPATH/src/github.com/algorand/go-algorand
3232
CMD ["/bin/bash"]

docker/build/cicd.centos.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ ENV GOROOT=/usr/local/go \
1818
RUN mkdir -p $GOPATH/src/github.com/algorand
1919
COPY . $GOPATH/src/github.com/algorand/go-algorand
2020
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH \
21-
GOPROXY=https://pkg.go.dev
21+
GOPROXY=https://proxy.golang.org,https://pkg.go.dev,https://goproxy.io,direct
2222
WORKDIR $GOPATH/src/github.com/algorand/go-algorand
23-
RUN make ci-deps && make clean
23+
RUN make clean
2424
RUN rm -rf $GOPATH/src/github.com/algorand/go-algorand && \
2525
mkdir -p $GOPATH/src/github.com/algorand/go-algorand
2626
RUN echo "vm.max_map_count = 262144" >> /etc/sysctl.conf

docker/build/cicd.ubuntu.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ ENV GOROOT=/usr/local/go \
1515
RUN mkdir -p $GOPATH/src/github.com/algorand
1616
COPY . $GOPATH/src/github.com/algorand/go-algorand
1717
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH \
18-
GOPROXY=https://pkg.go.dev
18+
GOPROXY=https://proxy.golang.org,https://pkg.go.dev,https://goproxy.io,direct
1919
WORKDIR $GOPATH/src/github.com/algorand/go-algorand
20-
RUN make ci-deps && make clean
20+
RUN make clean
2121
RUN rm -rf $GOPATH/src/github.com/algorand/go-algorand && \
2222
mkdir -p $GOPATH/src/github.com/algorand/go-algorand
2323
RUN echo "vm.max_map_count = 262144" >> /etc/sysctl.conf

scripts/release/mule/Makefile.mule

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22

33
PKG_DIR = $(SRCPATH)/tmp/node_pkgs/$(OS_TYPE)/$(ARCH)
44

5-
.PHONY: ci-clean ci-deps ci-setup ci-build
5+
.PHONY: ci-clean ci-setup ci-build
66

77
ci-clean:
88
rm -rf tmp
99

10-
ci-deps:
11-
scripts/configure_dev-deps.sh && \
12-
scripts/check_deps.sh
13-
1410
ci-setup:
1511
mkdir -p $(PKG_DIR)
1612

0 commit comments

Comments
 (0)