{Docker,Make}file: fixup using tools and Go version

RyanSquared · Sep 22, 2023 · 43cb8ba · 43cb8ba
1 parent 28562be
commit 43cb8ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.3
-ARG TOOLS=TOOLS
+FROM golang:1.20.8-bullseye AS builder
 
-FROM golang:1.20 AS builder
+ARG TOOLS=tools
 
 RUN mkdir /build
 ADD Makefile /build

diff --git a/Makefile b/Makefile
@@ -36,6 +36,7 @@ echo:
 	@echo "TOOLS?=$(TOOLS)"
 	@echo "DOCKER_IMAGE_NAME?=$(DOCKER_IMAGE_NAME)"
 	@echo "DOCKER_TARGET?=$(DOCKER_TARGET)"
+	@echo "TOOLS?=$(TOOLS)"
 	@cat config/tools.env | grep '^export' | cut -d' ' -f2
 	@cat config/tools.env | grep '^export' | cut -d' ' -f2