diff --git a/Makefile b/Makefile index 4ab4738b..67684549 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ build_local_controller_image: #--------- define BUILD_BASE_IMAGE -IMAGE_DIR=` dirname $(DOCKERFILE_PATH) ` \ +IMAGE_DIR=` dirname $(DOCKERFILE_PATH) ` ; \ sed -i '2 a \ARG TARGETPLATFORM' $(DOCKERFILE_PATH) ; \ sed -i '2 a \ARG BUILDPLATFORM' $(DOCKERFILE_PATH) ; \ TAG=` git ls-tree --full-tree HEAD -- $${IMAGE_DIR} | awk '{ print $$3 }' ` ; \ diff --git a/docs/README.md b/docs/README.md index 1839eb93..6192f689 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,9 +4,11 @@ 1. copy repo `cp -rf rocktemplate/* YourRepoName && cp rocktemplate/.gitignore YourRepoName && cp rocktemplate/.github YourRepoName ` - replace all 'rocktemplate' to 'YourRepoName' + replace all 'rocktemplate' to 'yourRepoName' + replace all 'Rocktemplate' to 'YourRepoName' replace all 'spidernet-io' and 'spidernet.io' to 'YourOrigin' + 注意保持 github.com/spidernet-io/e2eframework replace all 'Copyright 2022' to be the right time @@ -15,11 +17,10 @@ 3. in a linux machine, update api/v1/openapi.yaml and `make update_openapi_sdk` 4. redefine CRD in pkg/k8s/v1 - rename directory name 'pkg/k8s/apis/rocktemplate.spidernet.io' - replace all 'mybook' to 'YourCRDName' - and `make update_crd_sdk`, and write code in pkg/mybookManager - + rename directory name 'pkg/k8s/apis/rocktemplate.spidernet.io' rename pkg/mybookManager and replace all 'mybook' with your CRD name in this directory + replace all 'mybook' and 'Mybook' to 'YourCRDName' + and `make update_crd_sdk`, and write code in pkg/mybookManager rm charts/crds/rocktemplate.spidernet.io_mybooks.yaml diff --git a/images/agent-base/Dockerfile b/images/agent-base/Dockerfile index fbefeca4..b9e6521e 100644 --- a/images/agent-base/Dockerfile +++ b/images/agent-base/Dockerfile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 ARG GOLANG_IMAGE=docker.io/library/golang:1.21.7 -ARG UBUNTU_IMAGE=docker.io/library/ubuntu:22.10 +ARG UBUNTU_IMAGE=docker.io/library/ubuntu:24.04 #========= build gops =============== FROM --platform=${TARGETPLATFORM} ${GOLANG_IMAGE} as gops-cni-builder diff --git a/images/agent-base/build-gops.sh b/images/agent-base/build-gops.sh index 761cb0da..43ef4d1e 100644 --- a/images/agent-base/build-gops.sh +++ b/images/agent-base/build-gops.sh @@ -9,7 +9,7 @@ set -o pipefail set -o nounset # https://github.com/google/gops -gops_version="v0.3.25" +gops_version="v0.3.28" mkdir -p /go/src/github.com/google cd /go/src/github.com/google diff --git a/images/controller-base/Dockerfile b/images/controller-base/Dockerfile index 229a74a6..4b8bff10 100644 --- a/images/controller-base/Dockerfile +++ b/images/controller-base/Dockerfile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 ARG GOLANG_IMAGE=docker.io/library/golang:1.21.7 -ARG UBUNTU_IMAGE=docker.io/library/ubuntu:22.10 +ARG UBUNTU_IMAGE=docker.io/library/ubuntu:24.04 #========= build gops =============== FROM --platform=${TARGETPLATFORM} ${GOLANG_IMAGE} as gops-cni-builder diff --git a/images/controller-base/build-gops.sh b/images/controller-base/build-gops.sh index 0d34dfed..4c75d8b4 100644 --- a/images/controller-base/build-gops.sh +++ b/images/controller-base/build-gops.sh @@ -9,7 +9,7 @@ set -o pipefail set -o nounset # https://github.com/google/gops -gops_version="v0.3.25" +gops_version="v0.3.28" mkdir -p /go/src/github.com/google cd /go/src/github.com/google