No need to run hack_fs

As the embed fs packaged all files.
And bump upx version.

.gitignore

@@ -19,3 +19,5 @@
 /dist
 /build
 *.swp
+
+/.vscode

Dockerfile.dapper

@@ -1,25 +1,28 @@
-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
 
-ENV UPX_VERSION 4.0.2
+ENV UPX_VERSION 4.2.1
 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/
 
 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="6906cf5ce850ae0bb51f286afaf3c10c5ff506af" \
+ENV GIT_COMMIT="b5d6adfbc855c3e0ef458e0aa0939c2582b8073f" \
     GIT_BRANCH="ke/v0.3" \
     GIT_SOURCE=${GOPATH}/src/github.com/rancher/steve \
-    CATTLE_DASHBOARD_UI_VERSION="v2.7.2-kube-explorer-ui-rc1"
+    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

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.suse.com/bci/bci-minimal:15.4
+FROM registry.suse.com/bci/bci-minimal:15.5
 
 COPY kube-explorer entrypoint.sh /usr/bin/
 ENTRYPOINT ["entrypoint.sh"]

scripts/build

@@ -5,6 +5,7 @@ source $(dirname $0)/version
 
 OS_ARCH_ARG_LINUX="amd64 arm arm64"
 OS_ARCH_ARG_DARWIN="amd64 arm64"
+OS_ARCH_ARG_WINDOWS="amd64"
 
 LD_INJECT_VALUES="-X github.com/rancher/steve/pkg/version.Version=$VERSION
                   -X github.com/rancher/steve/pkg/version.GitCommit=$COMMIT"
@@ -31,6 +32,15 @@ if [ -n "$CROSS" ]; then
                 "$LD_INJECT_VALUES" \
                 -o ${OUTPUT_BIN}
     done
+
+    for ARCH in ${OS_ARCH_ARG_WINDOWS}; do
+        OUTPUT_BIN="bin/kube-explorer-windows-$ARCH.exe"
+        echo "Building binary for windows/$ARCH..."
+        GOARCH=$ARCH GOOS=windows CGO_ENABLED=0 go build -tags embed \
+                -ldflags \
+                "$LD_INJECT_VALUES" \
+                -o ${OUTPUT_BIN}
+    done
 else
     # only build one for current platform
     CGO_ENABLED=0 go build -tags embed \
@@ -39,6 +49,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

scripts/download

@@ -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}
 
@@ -15,4 +15,3 @@ cp index.html ../index.html
 
 popd
 
-$(dirname $0)/hack_fs $GIT_SOURCE/pkg/ui/ui/

scripts/hack_fs

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-#
-# find . -type f -name "_*"
-#
-function hack_files() {
-    for f in $(find $1 -type f -name "_*"); do
-        name=$(basename $f)
-        updir=$(dirname $f)
-        new_path=$updir/${name:1}
-        echo "move $f $new_path"
-        mv $f $new_path
-    done
-}
-
-#
-# find . -type d -name "_*"
-#
-function hack_dirs() {
-    for d in $(find $1 -mindepth 1 -maxdepth 1 -type d); do
-        if [[ ! -d $d ]]; then
-            continue
-        fi
-        name=$(basename $d)
-        if [[ ${name:0:1} == "_" ]]; then
-            updir=$(dirname $d)
-            new_path=$updir/${name:1}
-            echo "move $d $new_path"
-            mv $d $new_path
-            hack_dirs $new_path
-            continue
-        fi
-        hack_dirs $d
-    done
-}
-
-pushd $1
-hack_files .
-hack_dirs .
-popd