Skip to content

Commit

Permalink
Add env var to control vlogger base image (#884)
Browse files Browse the repository at this point in the history
  • Loading branch information
roypaulin authored Jul 31, 2024
1 parent afa2ea1 commit c0e2e73
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ export VLOGGER_IMG
# If the current leg in the CI tests is leg-9
LEG9 ?= no
export LEG9
# What alpine image does the vlogger image use
VLOGGER_BASE_IMG?=alpine
# What version of alpine does the vlogger image use
VLOGGER_ALPINE_VERSION?=3.19
# The port number for the local registry
Expand Down Expand Up @@ -390,10 +392,11 @@ docker-build-operator: manifests generate fmt vet ## Build operator docker image

.PHONY: docker-build-vlogger
docker-build-vlogger: ## Build vertica logger docker image
docker pull alpine:${VLOGGER_ALPINE_VERSION} # Ensure we have the latest alpine version
docker pull ${VLOGGER_BASE_IMG}:${VLOGGER_ALPINE_VERSION} # Ensure we have the latest alpine version
docker buildx build \
-t ${VLOGGER_IMG} \
--load \
--build-arg BASE_IMG=${VLOGGER_BASE_IMG} \
--build-arg ALPINE_VERSION=${VLOGGER_ALPINE_VERSION} \
-f docker-vlogger/Dockerfile .

Expand Down
3 changes: 2 additions & 1 deletion docker-vlogger/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
# follow the idiomatic way in Kubernetes of logging to stdout.

ARG ALPINE_VERSION
FROM alpine:${ALPINE_VERSION}
ARG BASE_IMG
FROM ${BASE_IMG}:${ALPINE_VERSION}

# Tini - A tiny but valid init for containers
RUN apk add --no-cache tini
Expand Down

0 comments on commit c0e2e73

Please sign in to comment.