File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change @@ -18,11 +18,11 @@ push: docker-push
1818deploy : check-kubectl docker-build docker-push install
1919
2020docker-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
2424docker-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
2727clean : 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
3737build-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
4141push-all :
4242 docker push ${DRYCC_REGISTRY} /${IMAGE_PREFIX} /grafana:${VERSION}
Original file line number Diff line number Diff line change 1- FROM registry.drycc.cc/drycc/base:bookworm
1+ ARG CODENAME
2+ FROM registry.drycc.cc/drycc/base:${CODENAME}
23
34ENV DRYCC_UID=1001 \
45 DRYCC_GID=1001 \
Original file line number Diff line number Diff line change 1- FROM registry.drycc.cc/drycc/base:bookworm
1+ ARG CODENAME
2+ FROM registry.drycc.cc/drycc/base:${CODENAME}
23
34ENV DRYCC_UID=1001 \
45 DRYCC_GID=1001 \
You can’t perform that action at this time.
0 commit comments