Compare commits

...

5 Commits

Author SHA1 Message Date
niusmallnan
6b3215ba17 Disable compress for darwin releases 2023-05-16 10:35:29 +08:00
niusmallnan
cafe8d3b1e Bump steve and dashboard for Rancher v2.6.12 2023-05-16 10:35:11 +08:00
niusmallnan
72df772c20 Bump steve and dashboard for Rancher v2.6.11 2023-03-20 11:02:41 +08:00
niusmallnan
585cf9c8a6 Use --scanners instead of --security-checks 2023-03-20 11:02:12 +08:00
niusmallnan
f448fc1de0 Bump upx 4.0.2 2023-03-20 10:59:27 +08:00
3 changed files with 10 additions and 15 deletions

View File

@@ -99,7 +99,7 @@ steps:
- name: image-scan-head - name: image-scan-head
image: aquasec/trivy image: aquasec/trivy
commands: commands:
- trivy image --no-progress --ignore-unfixed --severity HIGH,CRITICAL --security-checks vuln --exit-code 1 cnrancher/kube-explorer:head-linux-amd64 - trivy image --no-progress --ignore-unfixed --severity HIGH,CRITICAL --scanners vuln --exit-code 1 cnrancher/kube-explorer:head-linux-amd64
volumes: volumes:
- name: docker - name: docker
path: /var/run/docker.sock path: /var/run/docker.sock

View File

@@ -1,28 +1,23 @@
FROM golang:1.19 FROM registry.suse.com/bci/golang:1.19
ARG DAPPER_HOST_ARCH ARG DAPPER_HOST_ARCH
ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
RUN apt-get update && \ RUN zypper -n install ca-certificates git-core wget curl unzip tar vim less file xz
apt-get install -y ca-certificates git wget curl xz-utils && \ RUN zypper install -y -f docker
rm -f /bin/sh && ln -s /bin/bash /bin/sh && \
curl -sL https://github.com/upx/upx/releases/download/v3.96/upx-3.96-${ARCH}_linux.tar.xz | tar xvJf - --strip-components=1 -C /tmp && \ ENV UPX_VERSION 4.0.2
RUN curl -sL https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-${ARCH}_linux.tar.xz | tar xvJf - --strip-components=1 -C /tmp && \
mv /tmp/upx /usr/bin/ mv /tmp/upx /usr/bin/
RUN if [ "${ARCH}" == "amd64" ]; then \ 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.49.0; \
fi fi
ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \ ENV GIT_COMMIT="9fc1f146baae51295bf8d4b3f3a2d24b79fddd43" \
DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm \
DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm64 \
DOCKER_URL=DOCKER_URL_${ARCH}
RUN wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker
ENV GIT_COMMIT="f8261f5f6e3a58f2e9a4b97ed5dc0a5f92b03c9e" \
GIT_BRANCH="ke/v0.2" \ GIT_BRANCH="ke/v0.2" \
GIT_SOURCE=${GOPATH}/src/github.com/rancher/steve \ GIT_SOURCE=${GOPATH}/src/github.com/rancher/steve \
CATTLE_DASHBOARD_UI_VERSION="v2.6.9-kube-explorer-ui-rc2" CATTLE_DASHBOARD_UI_VERSION="v2.6.12-kube-explorer-ui-rc1"
ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS
ENV DAPPER_SOURCE /opt/kube-explorer ENV DAPPER_SOURCE /opt/kube-explorer

View File

@@ -40,7 +40,7 @@ else
fi fi
for f in $(ls ./bin/); do for f in $(ls ./bin/); do
if [[ $f != *darwin-arm64 ]]; then if [[ $f != *darwin* ]]; then
upx -o $DAPPER_SOURCE/bin/$f bin/$f || true upx -o $DAPPER_SOURCE/bin/$f bin/$f || true
fi fi
if [ -f $DAPPER_SOURCE/bin/$f ]; then if [ -f $DAPPER_SOURCE/bin/$f ]; then