Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(dev): add ENVIRONMENT_AUTOPULL override to Makefile #18446

Merged
merged 2 commits into from
Sep 1, 2023
Merged

feat(dev): add ENVIRONMENT_AUTOPULL override to Makefile #18446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9369ac
feat(dev): add `ENVIRONMENT_AUTOPULL` override to Makefile
hhromic Aug 31, 2023
9fe1617
chore: add `AUTOPULL` to spell checker expect-list
hhromic Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/spelling/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ authsvc
autobenches
AUTOBUILD
AUTODESPAWN
AUTOPULL
autodiscovered
autodiscovery
autogen
Expand Down
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ export ENVIRONMENT_UPSTREAM ?= docker.io/timberio/vector-dev:sha-3eadc96742a3375
# Override to disable building the container, having it pull from the GitHub packages repo instead
# TODO: Disable this by default. Blocked by `docker pull` from GitHub Packages requiring authenticated login
export ENVIRONMENT_AUTOBUILD ?= true
# Override to disable force pulling the image, leaving the container tool to pull it only when necessary instead
export ENVIRONMENT_AUTOPULL ?= true
# Override this when appropriate to disable a TTY being available in commands with `ENVIRONMENT=true`
export ENVIRONMENT_TTY ?= true

Expand Down Expand Up @@ -144,8 +146,9 @@ define ENVIRONMENT_PREPARE
--file scripts/environment/Dockerfile \
.
endef
else
else ifeq ($(ENVIRONMENT_AUTOPULL), true)
define ENVIRONMENT_PREPARE
@echo "Pulling the environment image. (ENVIRONMENT_AUTOPULL=true)"
$(CONTAINER_TOOL) pull $(ENVIRONMENT_UPSTREAM)
endef
endif
Expand Down