Bump steve

And upgrade builder image to v1.21.
This commit is contained in:
Yuxing Deng 2023-11-10 15:24:31 +08:00
parent e016261c4b
commit 390b11caef
4 changed files with 12 additions and 6 deletions

View File

@ -1,7 +1,10 @@
FROM registry.suse.com/bci/golang:1.19
FROM registry.suse.com/bci/golang:1.21
ARG PROXY
ARG GOPROXY
ARG DAPPER_HOST_ARCH
ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
ENV https_proxy=${PROXY} \
http_proxy=${PROXY}
RUN zypper -n install ca-certificates git-core wget curl unzip tar vim less file xz
RUN zypper install -y -f docker
@ -11,15 +14,15 @@ RUN curl -sL https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${
mv /tmp/upx /usr/bin/
RUN if [ "${ARCH}" == "amd64" ]; then \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.49.0; \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.54.2; \
fi
ENV GIT_COMMIT="5d9667043a7b0b1541743dad47949df489b8ad04" \
ENV GIT_COMMIT="bcf55b3084dd66ef6236ea6b350d4419c7beb213" \
GIT_BRANCH="ke/v0.3" \
GIT_SOURCE=${GOPATH}/src/github.com/rancher/steve \
CATTLE_DASHBOARD_UI_VERSION="v2.7.5-kube-explorer-ui-rc7"
ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS
ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS GOPROXY
ENV DAPPER_SOURCE /opt/kube-explorer
ENV DAPPER_OUTPUT ./bin ./dist
ENV DAPPER_DOCKER_SOCKET true

View File

@ -39,6 +39,8 @@ else
-o bin/kube-explorer
fi
mkdir -p $DAPPER_SOURCE/bin
for f in $(ls ./bin/); do
if [[ $f != *darwin* ]]; then
upx -o $DAPPER_SOURCE/bin/$f bin/$f || true

View File

@ -4,7 +4,7 @@ mkdir -p $(dirname $GIT_SOURCE)
pushd $(dirname $GIT_SOURCE)
git clone --depth=1 --branch ${GIT_BRANCH} https://github.com/niusmallnan/steve.git
git clone --depth=1 --branch ${GIT_BRANCH} https://github.com/orangedeng/ke-steve.git steve
cd steve
git reset --hard ${GIT_COMMIT}

1
scripts/steve Submodule

@ -0,0 +1 @@
Subproject commit 26e14afc0b652b0363fc38e05ef28aa99d26694c