Skip to content

Commit d898b65

Browse files
committed
chore(monitor): add codename build-arg
1 parent 97f27f3 commit d898b65

5 files changed

Lines changed: 10 additions & 6 deletions

File tree

.woodpecker/build-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pipeline:
1717
- cd grafana && make build-all push-all && cd ..
1818
- cd telegraf && make build-all push-all && cd ..
1919
secrets:
20+
- codename
2021
- dev_registry
2122
- drycc_registry
2223
- container_username

.woodpecker/test-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pipeline:
1515
- cd grafana && make test && cd ..
1616
- cd telegraf && make test && cd ..
1717
secrets:
18+
- codename
1819
- dev_registry
1920
- drycc_registry
2021
- container_pull_secrets

default.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ push: docker-push
1818
deploy: check-kubectl docker-build docker-push install
1919

2020
docker-build:
21-
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
21+
docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
2222
docker tag ${IMAGE} ${MUTABLE_IMAGE}
2323

2424
docker-buildx:
25-
docker buildx build --platform ${PLATFORM} -t ${IMAGE} rootfs --push
25+
docker buildx build --build-arg CODENAME=${CODENAME} --platform ${PLATFORM} -t ${IMAGE} rootfs --push
2626

2727
clean: check-docker
2828
docker rmi $(IMAGE)
@@ -35,8 +35,8 @@ test-style:
3535
.PHONY: build push docker-build clean upgrade deploy test test-style
3636

3737
build-all:
38-
docker build ${DOCKER_BUILD_FLAGS} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION} ../grafana/rootfs
39-
docker build ${DOCKER_BUILD_FLAGS} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/telegraf:${VERSION} ../telegraf/rootfs
38+
docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION} ../grafana/rootfs
39+
docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/telegraf:${VERSION} ../telegraf/rootfs
4040

4141
push-all:
4242
docker push ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION}

grafana/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 \

telegraf/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 \

0 commit comments

Comments
 (0)