From 7bbfd0ff4956fd50e18cfb6f6f994f3f9446d77d Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 28 Mar 2022 19:38:30 -0500 Subject: [PATCH] 3rdparty/docker/bootstrap: Cleanup, little modernization Change-Id: Icc16b3fca48ffe072aed06c495d93fc3c74deead --- 3rdparty/docker/bootstrap/Dockerfile | 2 +- 3rdparty/docker/bootstrap/Makefile | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/3rdparty/docker/bootstrap/Dockerfile b/3rdparty/docker/bootstrap/Dockerfile index e86133deff..062fd6c46d 100644 --- a/3rdparty/docker/bootstrap/Dockerfile +++ b/3rdparty/docker/bootstrap/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM docker.io/debian:bullseye-slim ENV DEBIAN_FRONTEND="noninteractive" diff --git a/3rdparty/docker/bootstrap/Makefile b/3rdparty/docker/bootstrap/Makefile index 986525f892..267be69027 100644 --- a/3rdparty/docker/bootstrap/Makefile +++ b/3rdparty/docker/bootstrap/Makefile @@ -1,4 +1,5 @@ ENGINE=docker +VER=bullseye-slim-1 #ENGINE=podman # Example mounting source code directory into container @@ -7,16 +8,16 @@ SOURCES=$(HOME)/Code EXTRA=-v $(SOURCES)/haiku:/work/src/haiku -v $(SOURCES)/buildtools:/work/src/buildtools default: - ${ENGINE} build . --no-cache -t docker.io/haiku/bootstrap + ${ENGINE} build . --no-cache -t docker.io/haiku/bootstrap:${VER} clean: - ${ENGINE} ps -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} kill {} - ${ENGINE} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} rm {} + ${ENGINE} ps -q --filter=ancestor=docker.io/haiku/bootstrap:${VER} | xargs -I {} ${ENGINE} kill {} + ${ENGINE} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap:${VER} | xargs -I {} ${ENGINE} rm {} ${ENGINE} volume rm bootstrap_work prep: - ${ENGINE} run -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap prep + ${ENGINE} run -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap:${VER} prep crosstools: - ${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap crosstools + ${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap:${VER} crosstools bootstrap: - ${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap bootstrap + ${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap:${VER} bootstrap enter: - ${ENGINE} run -it -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap /bin/bash -l + ${ENGINE} run -it -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap:${VER} /bin/bash -l