Skip to content

Commit e269938

Browse files
committed
chore(database): add codename build-arg
1 parent b6783f3 commit e269938

4 files changed

Lines changed: 6 additions & 3 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
1616
secrets:
17+
- codename
1718
- dev_registry
1819
when:
1920
event:

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
COPY rootfs/usr /usr/
45
COPY rootfs/entrypoint.sh /entrypoint.sh

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ all: docker-build docker-push
2323
# For cases where we're building from local
2424
# We also alter the RC file to set the image name.
2525
docker-build:
26-
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} .
26+
docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE} .
2727
docker tag ${IMAGE} ${MUTABLE_IMAGE}
2828

2929
docker-buildx:
30-
docker buildx build --platform ${PLATFORM} -t ${IMAGE} . --push
30+
docker buildx build --build-arg CODENAME=${CODENAME} --platform ${PLATFORM} -t ${IMAGE} . --push
3131

3232
test: test-style
3333

0 commit comments

Comments
 (0)