File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ pipeline:
1414 commands :
1515 - make test
1616 secrets :
17+ - codename
1718 - dev_registry
1819 when :
1920 event :
Original file line number Diff line number Diff line change 1+ ARG CODENAME
2+
13FROM registry.drycc.cc/drycc/go-dev:latest AS build
24ARG LDFLAGS
35ADD . /workspace
@@ -7,7 +9,7 @@ RUN export GO111MODULE=on \
79 && upx -9 --brute /usr/local/bin/registry
810
911
10- FROM registry.drycc.cc/drycc/base:bookworm
12+ FROM registry.drycc.cc/drycc/base:${CODENAME}
1113
1214ENV DRYCC_UID=1001 \
1315 DRYCC_GID=1001 \
Original file line number Diff line number Diff line change @@ -36,11 +36,11 @@ build: check-docker
3636# For cases where we're building from local
3737# We also alter the RC file to set the image name.
3838docker-build : check-docker
39- docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} --build-arg LDFLAGS=${LDFLAGS} .
39+ docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME= ${CODENAME} - t ${IMAGE} --build-arg LDFLAGS=${LDFLAGS} .
4040 docker tag ${IMAGE} ${MUTABLE_IMAGE}
4141
4242docker-buildx : check-docker
43- docker buildx build --platform ${PLATFORM} -t ${IMAGE} --build-arg LDFLAGS=${LDFLAGS} . --push
43+ docker buildx build --build-arg CODENAME= ${CODENAME} -- platform ${PLATFORM} -t ${IMAGE} --build-arg LDFLAGS=${LDFLAGS} . --push
4444
4545build-binary :
4646 ${DEV_ENV_CMD} go build -ldflags ${LDFLAGS} -o $(BINDIR ) /${SHORT_NAME} main.go
You can’t perform that action at this time.
0 commit comments