Skip to content

Remove ci-deps and update GOPROXY in Dockerfiles #2247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
algojohnlee merged 5 commits into from
Jun 7, 2021
Merged

Remove ci-deps and update GOPROXY in Dockerfiles #2247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01724db
Deprecate scripts/configure_dev-deps.sh in Makefile's ci-build
onetechnical Jun 6, 2021
4eab5fc
Add GOPROXY and remove make ci-deps from cicd.ubuntu.Dockerfile
onetechnical Jun 6, 2021
780c0d6
Add to GOPROXY to reduce pull errors
onetechnical Jun 7, 2021
bede157
Remove references to ci-deps altogether
onetechnical Jun 7, 2021
895a5b8
Bugfix - add missing GOPROXY= to centos Dockerfile ENV
onetechnical Jun 7, 2021
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
2 changes: 1 addition & 1 deletion docker/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WORKDIR /root
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
ENV GOROOT=/usr/local/go \
GOPATH=$HOME/go \
GOPROXY=https://pkg.go.dev,https://goproxy.io,direct
GOPROXY=https://proxy.golang.org,https://pkg.go.dev,https://goproxy.io,direct
RUN mkdir -p $GOPATH/src/github.com/algorand
WORKDIR $GOPATH/src/github.com/algorand
COPY ./go-algorand ./go-algorand/
Expand Down
2 changes: 1 addition & 1 deletion docker/build/Dockerfile-deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WORKDIR /root
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
ENV GOROOT=/usr/local/go \
GOPATH=$HOME/go \
GOPROXY=https://pkg.go.dev,https://goproxy.io,direct
GOPROXY=https://proxy.golang.org,https://pkg.go.dev,https://goproxy.io,direct
RUN mkdir -p $GOPATH/src/github.com/algorand
WORKDIR $GOPATH/src/github.com/algorand
COPY . ./go-algorand/
Expand Down
4 changes: 2 additions & 2 deletions docker/build/cicd.alpine.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ RUN apk add dpkg && \
COPY . $GOPATH/src/github.com/algorand/go-algorand
WORKDIR $GOPATH/src/github.com/algorand/go-algorand
ENV GCC_CONFIG="--with-arch=armv6" \
GOPROXY=https://pkg.go.dev,https://goproxy.io,direct
RUN make ci-deps && make clean
GOPROXY=https://proxy.golang.org,https://pkg.go.dev,https://goproxy.io,direct
RUN make clean
RUN rm -rf $GOPATH/src/github.com/algorand/go-algorand && \
mkdir -p $GOPATH/src/github.com/algorand/go-algorand
CMD ["/bin/bash"]
4 changes: 2 additions & 2 deletions docker/build/cicd.centos.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ ENV GOROOT=/usr/local/go \
RUN mkdir -p $GOPATH/src/github.com/algorand
COPY . $GOPATH/src/github.com/algorand/go-algorand
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH \
GOPROXY=https://pkg.go.dev
GOPROXY=https://proxy.golang.org,https://pkg.go.dev,https://goproxy.io,direct
WORKDIR $GOPATH/src/github.com/algorand/go-algorand
RUN make ci-deps && make clean
RUN make clean
RUN rm -rf $GOPATH/src/github.com/algorand/go-algorand && \
mkdir -p $GOPATH/src/github.com/algorand/go-algorand
RUN echo "vm.max_map_count = 262144" >> /etc/sysctl.conf
Expand Down
4 changes: 2 additions & 2 deletions docker/build/cicd.ubuntu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ ENV GOROOT=/usr/local/go \
RUN mkdir -p $GOPATH/src/github.com/algorand
COPY . $GOPATH/src/github.com/algorand/go-algorand
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH \
GOPROXY=https://pkg.go.dev
GOPROXY=https://proxy.golang.org,https://pkg.go.dev,https://goproxy.io,direct
WORKDIR $GOPATH/src/github.com/algorand/go-algorand
RUN make ci-deps && make clean
Copy link
Contributor

@bricerisingalgorand bricerisingalgorand Jun 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

./scripts/buildtools/install_buildtools.sh

I think we'll need to run this for the image to work, unless you've already seen that it works without it

Copy link
Contributor Author

@onetechnical onetechnical Jun 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this works without it for the build. (Historically it didn't, I know.)

RUN make clean
RUN rm -rf $GOPATH/src/github.com/algorand/go-algorand && \
mkdir -p $GOPATH/src/github.com/algorand/go-algorand
RUN echo "vm.max_map_count = 262144" >> /etc/sysctl.conf
Expand Down
6 changes: 1 addition & 5 deletions scripts/release/mule/Makefile.mule
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@

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

.PHONY: ci-clean ci-deps ci-setup ci-build
.PHONY: ci-clean ci-setup ci-build

ci-clean:
rm -rf tmp

ci-deps:
scripts/configure_dev-deps.sh && \
scripts/check_deps.sh

ci-setup:
mkdir -p $(PKG_DIR)

Expand Down