Skip to content

Commit c5e46a0

Browse files
committed
Threads docker secret through makefile build target if set
1 parent 90fa534 commit c5e46a0

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ jobs:
1717
uses: plus3it/actions-workflows/.github/workflows/release.yml@00bdf2c02c2bb252dc7ba7f74816ac8359aa6693
1818
secrets:
1919
release-token: ${{ secrets.GH_RELEASES_TOKEN }}
20+
with:
21+
mockstacktest-enable: false

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,10 @@ docker/build:
487487
@echo "[$@]: building docker image named: $(IMAGE_NAME)"
488488
$(DOCKER_BUILDKIT) docker build -t $(IMAGE_NAME) \
489489
--build-arg PROJECT_NAME=$(TARDIGRADE_CI_PROJECT) \
490-
--build-arg PYTHON_38_VERSION=$(PYTHON_38_VERSION) \
490+
--build-arg PYTHON_312_VERSION=$(PYTHON_312_VERSION) \
491491
--build-arg USER_UID=$$(id -u) \
492492
--build-arg USER_GID=$$(id -g) \
493+
$(if $(GITHUB_ACCESS_TOKEN),--secret id=GITHUB_ACCESS_TOKEN,env=GITHUB_ACCESS_TOKEN,) \
493494
-f $(TARDIGRADE_CI_DOCKERFILE) .
494495
@echo "[$@]: Docker image build complete"
495496

0 commit comments

Comments
 (0)