Skip to content

ci: use environment variable for goproxy #179

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
merged 1 commit into from
Apr 1, 2022
Merged

ci: use environment variable for goproxy #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions dockerfiles/Dockerfile.dashboard.deb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ RUN /install-common.sh install_dashboard_dependencies_deb

ARG checkout_v="v2.3"
ARG iteration="0"
ARG goproxy="https://proxy.golang.com.cn,direct"
ARG IMAGE_BASE
ARG IMAGE_TAG
ARG CODE_PATH
Expand Down
1 change: 1 addition & 0 deletions dockerfiles/Dockerfile.dashboard.rpm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ RUN /install-common.sh install_dashboard_dependencies_rpm

ARG checkout_v="v2.3"
ARG iteration="0"
ARG goproxy="https://proxy.golang.com.cn,direct"
ARG IMAGE_BASE
ARG IMAGE_TAG
ARG CODE_PATH
Expand Down
10 changes: 5 additions & 5 deletions utils/install-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ install_luarocks() {
}

install_etcd() {
wget https://github.com/etcd-io/etcd/releases/download/${RUNNING_ETCD_VERSION}/etcd-${RUNNING_ETCD_VERSION}-linux-amd64.tar.gz
wget https://github.com/etcd-io/etcd/releases/download/"${RUNNING_ETCD_VERSION}"/etcd-"${RUNNING_ETCD_VERSION}"-linux-amd64.tar.gz
tar -zxvf etcd-"${RUNNING_ETCD_VERSION}"-linux-amd64.tar.gz
}

Expand All @@ -94,8 +94,8 @@ install_apisix() {
chown -R "$(whoami)":"$(whoami)" /tmp/build/output
cd ..
# copy the compiled files to the package install directory
cp /tmp/build/output/apisix/usr/local/apisix/deps/lib64/luarocks/rocks-5.1/apisix/master-${iteration}/bin/apisix /tmp/build/output/apisix/usr/bin/ || true
cp /tmp/build/output/apisix/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/master-${iteration}/bin/apisix /tmp/build/output/apisix/usr/bin/ || true
cp /tmp/build/output/apisix/usr/local/apisix/deps/lib64/luarocks/rocks-5.1/apisix/master-"${iteration}"/bin/apisix /tmp/build/output/apisix/usr/bin/ || true
cp /tmp/build/output/apisix/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/master-"${iteration}"/bin/apisix /tmp/build/output/apisix/usr/bin/ || true
# modify the apisix entry shell to be compatible with version 2.2 and 2.3
if is_newer_version "${checkout_v}"; then
echo 'use shell '
Expand All @@ -113,7 +113,7 @@ install_apisix() {
fi
# delete unnecessary files
rm -rf /tmp/build/output/apisix/usr/local/apisix/deps/lib64/luarocks
rm -rf /tmp/build/output/apisix/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/master-${iteration}/doc
rm -rf /tmp/build/output/apisix/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/master-"${iteration}"/doc
}

install_golang() {
Expand Down Expand Up @@ -151,7 +151,7 @@ install_dashboard() {
export PATH=$PATH:$GOROOT/bin:$GOPATH/bin
cd "$HOME"
mkdir gopath
go env -w GOPROXY=https://goproxy.cn,direct
go env -w GOPROXY="${goproxy}"
cd /tmp/
cd /apisix-dashboard
make build
Expand Down