Skip to content

Commit 2661a3d

Browse files
committed
chore(controller): add codename build-arg
1 parent 840c213 commit 2661a3d

6 files changed

Lines changed: 9 additions & 7 deletions

File tree

.woodpecker/build-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ pipeline:
1616
- echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
1717
- make docker-build docker-immutable-push
1818
secrets:
19+
- codename
1920
- dev_registry
2021
- drycc_registry
2122
- container_username

.woodpecker/test-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pipeline:
1414
commands:
1515
- make test docker-build-test upload-coverage
1616
secrets:
17+
- codename
1718
- dev_registry
1819
- codecov_token
1920
when:

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ check-docker:
2828
build: docker-build
2929

3030
docker-build: check-docker
31-
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
31+
docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
3232
docker tag ${IMAGE} ${MUTABLE_IMAGE}
3333

3434
docker-buildx: check-docker
35-
docker buildx build --platform ${PLATFORM} -t ${IMAGE} rootfs --push
35+
docker buildx build --build-arg CODENAME=${CODENAME} --platform ${PLATFORM} -t ${IMAGE} rootfs --push
3636

3737
docker-build-test: check-docker
38-
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
38+
docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
3939

4040
deploy: check-kubectl docker-build docker-push
4141
kubectl --namespace=drycc patch deployment drycc-$(COMPONENT) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ metadata:
44
name: controller-creds
55
labels:
66
heritage: drycc
7-
annotations:
8-
"helm.sh/hook": pre-install
97
data:
108
{{- if (.Values.databaseUrl) }}
119
database-url: {{ .Values.databaseUrl | b64enc }}

rootfs/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM registry.drycc.cc/drycc/base:bookworm
1+
ARG CODENAME
2+
FROM registry.drycc.cc/drycc/base:${CODENAME}
23

34
ENV DRYCC_UID=1001 \
45
DRYCC_GID=1001 \

rootfs/Dockerfile.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM registry.drycc.cc/drycc/base:bookworm
1+
ARG CODENAME
2+
FROM registry.drycc.cc/drycc/base:${CODENAME}
23

34
ARG DRYCC_HOME_DIR=/workspace
45

0 commit comments

Comments
 (0)