From e371a4a3c3c50ea05ff41db51caa268c8442546d Mon Sep 17 00:00:00 2001 From: Julien Neuhart Date: Sun, 15 Sep 2024 16:12:45 +0200 Subject: [PATCH] fix: add DOCKER_REGISTRY for tests image --- Makefile | 1 + test/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 08ee39aa..de8db412 100644 --- a/Makefile +++ b/Makefile @@ -149,6 +149,7 @@ run: ## Start a Gotenberg container build-tests: ## Build the tests' Docker image docker build \ --build-arg GOLANG_VERSION=$(GOLANG_VERSION) \ + --build-arg DOCKER_REGISTRY=$(DOCKER_REGISTRY) \ --build-arg DOCKER_REPOSITORY=$(DOCKER_REPOSITORY) \ --build-arg GOTENBERG_VERSION=$(GOTENBERG_VERSION) \ --build-arg GOLANGCI_LINT_VERSION=$(GOLANGCI_LINT_VERSION) \ diff --git a/test/Dockerfile b/test/Dockerfile index 723c3fa3..5011f506 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -1,4 +1,5 @@ ARG GOLANG_VERSION +ARG DOCKER_REGISTRY ARG DOCKER_REPOSITORY ARG GOTENBERG_VERSION ARG GOLANGCI_LINT_VERSION @@ -7,7 +8,7 @@ FROM golang:$GOLANG_VERSION-bookworm AS golang # We're extending the Gotenberg's Docker image because our code relies on external # dependencies like Google Chrome, LibreOffice, etc. -FROM $DOCKER_REPOSITORY/gotenberg:$GOTENBERG_VERSION +FROM $DOCKER_REGISTRY/$DOCKER_REPOSITORY:$GOTENBERG_VERSION USER root