Move Dockerfiles to build-aux/docker/images

Creates a build-aux/docker directory where we can put all things Docker, adds an initial image directory there, and moves existing Dockerfiles to that directory. Signed-off-by: Thomas Hallgren <[email protected]>
telepresenceio · Jan 31, 2023 · 65b66a8 · 65b66a8
1 parent c81cded
commit 65b66a8
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,11 +1,9 @@
 .circleci/
 .idea/
 .git/
-base-image/
 build-aux/
 build-output/
 !build-output/version.txt
-docs/
 integration_test/
 k8s/
 packaging/

diff --git a/base-image/Dockerfile → build-aux/docker/images/Dockerfile.traffic b/base-image/Dockerfile → build-aux/docker/images/Dockerfile.traffic
diff --git a/build-aux/Dockerfile.winbuild → build-aux/docker/images/Dockerfile.winbuild b/build-aux/Dockerfile.winbuild → build-aux/docker/images/Dockerfile.winbuild
@@ -1,4 +1,4 @@
-FROM golang:1.18.5
+FROM golang:1.19.4
 
 
 RUN apt-get update && \

diff --git a/build-aux/main.mk b/build-aux/main.mk
@@ -161,7 +161,7 @@ release-binary: $(TELEPRESENCE)
 image: build-deps
 	mkdir -p $(BUILDDIR)
 	printf $(TELEPRESENCE_VERSION) > $(BUILDDIR)/version.txt ## Pass version in a file instead of a --build-arg to maximize cache usage
-	docker build --target tel2 --tag tel2 --tag $(TELEPRESENCE_REGISTRY)/tel2:$(patsubst v%,%,$(TELEPRESENCE_VERSION)) -f base-image/Dockerfile .
+	docker build --target tel2 --tag tel2 --tag $(TELEPRESENCE_REGISTRY)/tel2:$(patsubst v%,%,$(TELEPRESENCE_VERSION)) -f build-aux/docker/images/Dockerfile.traffic .
 
 .PHONY: push-image
 push-image: image ## (Build) Push the manager/agent container image to $(TELEPRESENCE_REGISTRY)

diff --git a/build-aux/winmake.bat b/build-aux/winmake.bat
@@ -12,7 +12,7 @@ if not exist .wintools\jq.exe (
     curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win64.exe --output .\.wintools\jq.exe
 )
 
-docker build . -f .\build-aux\Dockerfile.winbuild -t tel2-winbuild || exit \b
+docker build . -f .\build-aux\docker\images\Dockerfile.winbuild -t tel2-winbuild || exit \b
 
 set pwd=%~dp0
 set pwd=%pwd:~3%