Merge pull request #347 from xiaods/dev

fix: fix Dockerfile issue
xiaods · Oct 21, 2024 · b030929 · b030929
2 parents 5058851 + 5f0ef85
commit b030929
Show file tree

Hide file tree

Showing 17 changed files with 167 additions and 376 deletions.
diff --git a/.github/workflows/builder-arm64.yaml b/.github/workflows/builder-arm64.yaml
@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@master
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.20.10'
+        go-version: '1.22.5'
         cache-dependency-path: subdir/go.sum
     - name: generate resources
       run: mkdir -p {build/data,build/static}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@master
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.20.10'
+        go-version: '1.22.5'
         cache-dependency-path: subdir/go.sum
     - name: check depends
       run: sudo apt-get install -y libseccomp-dev

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -21,7 +21,7 @@ jobs:
         ref: 'dev'
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.20.10'
+        go-version: '1.22.5'
         cache-dependency-path: subdir/go.sum
     - name: generate resources
       run: |

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -48,10 +48,10 @@ ARG SELINUX=true
 ENV SELINUX=${SELINUX}
 
 # Set Dapper configuration variables
-ENV DAPPER_RUN_ARGS --privileged -v k8e-cache:/go/src/github.com/xiaods/k8e/.cache -v trivy-cache:/root/.cache/trivy \
-    DAPPER_ENV REPO TAG RELEASE_TAG IMAGE_NAME SKIP_VALIDATE GCLOUD_AUTH GITHUB_TOKEN GOLANG GOOS GOARCH DEBUG \
+ENV DAPPER_RUN_ARGS="--privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.cache -v trivy-cache:/root/.cache/trivy" \
+    DAPPER_ENV="REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_IMAGE SKIP_AIRGAP AWS_SECRET_ACCESS_KEY AWS_ACCESS_KEY_ID GITHUB_TOKEN GOLANG GOCOVER DEBUG" \
     DAPPER_SOURCE="/go/src/github.com/xiaods/k8e/" \
-    DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy \
+    DAPPER_OUTPUT="./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy" \
     DAPPER_DOCKER_SOCKET=true \
     CROSS=true \
     STATIC_BUILD=true

diff --git a/pkg/codegen/main.go b/pkg/codegen/main.go
@@ -69,7 +69,7 @@ func main() {
 
 	controllergen.Run(args.Options{
 		OutputPackage: "github.com/xiaods/k8e/pkg/generated",
-		Boilerplate:   "scripts/boilerplate.go.txt",
+		Boilerplate:   "hack/boilerplate.go.txt",
 		Groups: map[string]args.Group{
 			"k8e.cattle.io": {
 				Types: []interface{}{

diff --git a/pkg/deploy/zz_generated_bindata.go b/pkg/deploy/zz_generated_bindata.go
diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go
diff --git a/pkg/generated/clientset/versioned/doc.go b/pkg/generated/clientset/versioned/doc.go
diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/generated/clientset/versioned/typed/k8e.cattle.io/v1/addon.go b/pkg/generated/clientset/versioned/typed/k8e.cattle.io/v1/addon.go