chore(passport): add codename build-arg

Author: duanhongyi

.woodpecker/build-linux.yml

@@ -16,6 +16,7 @@ pipeline:
   - echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
   - make docker-build docker-immutable-push
   secrets:
+  - codename
   - dev_registry
   - drycc_registry
   - container_username

.woodpecker/test-linux.yml

@@ -14,6 +14,7 @@ pipeline:
   commands:
   - make test docker-build-test upload-coverage
   secrets:
+  - codename
   - dev_registry
   - codecov_token
   when:

Makefile

@@ -28,14 +28,14 @@ check-docker:
 build: docker-build
 
 docker-build: check-docker
-	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
+	docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
 docker-buildx: check-docker
-	docker buildx build --platform ${PLATFORM} -t ${IMAGE} rootfs --push
+	docker buildx build --build-arg CODENAME=${CODENAME} --platform ${PLATFORM} -t ${IMAGE} rootfs --push
 
 docker-build-test: check-docker
-	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
+	docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
 
 deploy: check-kubectl docker-build docker-push
 	kubectl --namespace=drycc patch deployment drycc-$(COMPONENT) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'

charts/passport/templates/passport-secret-creds.yaml

@@ -5,8 +5,6 @@ metadata:
   name: passport-creds
   labels:
     heritage: drycc
-  annotations:
-    "helm.sh/hook": pre-install
 data:
   {{- if (.Values.databaseUrl) }}
   database-url: {{ .Values.databaseUrl | b64enc }}

rootfs/Dockerfile

@@ -1,4 +1,5 @@
-FROM registry.drycc.cc/drycc/base:bookworm as build-app
+ARG CODENAME
+FROM registry.drycc.cc/drycc/base:${CODENAME} as build-app
 
 ADD web /web
 WORKDIR /web
@@ -10,7 +11,7 @@ RUN install-stack node $NODE_VERSION && . init-stack \
   && yarn install \
   && yarn build
 
-FROM registry.drycc.cc/drycc/base:bookworm
+FROM registry.drycc.cc/drycc/base:${CODENAME}
 
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \

rootfs/Dockerfile.test

@@ -1,4 +1,5 @@
-FROM registry.drycc.cc/drycc/base:bookworm
+ARG CODENAME
+FROM registry.drycc.cc/drycc/base:${CODENAME}
 
 ENV DRYCC_HOME_DIR=/workspace \
   PGDATA="/var/lib/postgresql/data" \