From f9f7656404e35ff45417c6025fb5f22e4c524f0d Mon Sep 17 00:00:00 2001
From: w13b3 <wiebe@email.com>
Date: Sat, 6 Apr 2024 22:24:13 +0200
Subject: [PATCH] :wine_glass:

---
 Dockerfile.redbean-alpine  |  5 +++--
 Dockerfile.redbean-build   |  4 ++--
 Dockerfile.redbean-scratch |  5 +++--
 Makefile                   | 38 ++++++++++++++++++++++++++++----------
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/Dockerfile.redbean-alpine b/Dockerfile.redbean-alpine
index 10b37e3..d7c26a5 100644
--- a/Dockerfile.redbean-alpine
+++ b/Dockerfile.redbean-alpine
@@ -1,10 +1,11 @@
 # syntax=docker/dockerfile:1
 # # FROM args
+ARG GIT_REPO_OWNER=none
+ARG BUILD_TAG=latest
 ARG ALPINE_TAG=3.19.1
-ARG IMAGE_TAG=latest
 
 # # build image
-FROM redbean-build:${IMAGE_TAG} AS build
+FROM ghcr.io/${GIT_REPO_OWNER}/redbean-build:${BUILD_TAG} AS build
 
 # # final image
 FROM docker.io/library/alpine:${ALPINE_TAG} AS final
diff --git a/Dockerfile.redbean-build b/Dockerfile.redbean-build
index fea85ab..d3a0833 100644
--- a/Dockerfile.redbean-build
+++ b/Dockerfile.redbean-build
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1
 # # FROM args
-ARG DEBIAN_TAG=bookworm-20240311-slim
+ARG BUILD_DEBIAN_TAG=bookworm-20240311-slim
 
 # # # build stage
-FROM docker.io/library/debian:${DEBIAN_TAG} AS build
+FROM docker.io/library/debian:${BUILD_DEBIAN_TAG} AS build
 
 # # environment variables
 ENV LANG=C.UTF-8
diff --git a/Dockerfile.redbean-scratch b/Dockerfile.redbean-scratch
index 5c82477..e694c61 100644
--- a/Dockerfile.redbean-scratch
+++ b/Dockerfile.redbean-scratch
@@ -1,9 +1,10 @@
 # syntax=docker/dockerfile:1
 # # FROM args
-ARG IMAGE_TAG=latest
+ARG GIT_REPO_OWNER=none
+ARG BUILD_TAG=latest
 
 # # build image
-FROM redbean-build:${IMAGE_TAG} AS build
+FROM ghcr.io/${GIT_REPO_OWNER}/redbean-build:${BUILD_TAG} AS build
 
 # # normalize the binary to ELF
 RUN --network=none <<EOT
diff --git a/Makefile b/Makefile
index 75ac3a7..69e53e6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,16 @@ SHELL := /usr/bin/env sh
 
 
 # # # Default variables
+
 MODE ?= optlinux
 REDBEAN_VERSION ?= latest
 
-IMAGE_TAG ?= latest
-DEBIAN_TAG ?= bookworm-20240311-slim
+BUILD_TAG ?= latest
+BUILD_DEBIAN_TAG ?= bookworm-20240311-slim
 ALPINE_TAG ?= 3.19.1
 
+GIT_REPO_OWNER ?= none
+
 
 # # # Help
 
@@ -21,6 +24,7 @@ help:
 	@echo "  all"
 	@echo "  lint-dockerfile FILE"
 	@echo "  lint-all"
+	@echo "  redbean"
 	@echo "  redbean-build"
 	@echo "  redbean-alpine"
 	@echo "  redbean-scratch"
@@ -29,30 +33,44 @@ help:
 # # # Default goal
 
 .PHONY: all
-all: lint-all
+all: redbean
 	$(info Done running 'make all')
 
 
 # # # Build
 
+.PHONY: redbean
+redbean: redbean-scratch
+	$(info Done running 'make redbean')
+
 .PHONY: redbean-build
 redbean-build:
 	DOCKER_BUILDKIT=1 docker buildx build $(CURDIR) \
-		--tag=$@:$(IMAGE_TAG) \
+		--load \
 		--file=$(CURDIR)/Dockerfile.redbean-build \
-		--build-arg=DEBIAN_TAG=$(DEBIAN_TAG) \
-		--build-arg=MODE=$(MODE)
+		--build-arg=MODE=$(MODE) \
+		--build-arg=BUILD_DEBIAN_TAG=$(BUILD_DEBIAN_TAG) \
+		--tag=redbean-build:$(BUILD_TAG) \
+		--tag=ghcr.io/$(GIT_REPO_OWNER)/redbean-build:$(BUILD_TAG)
 
 redbean-alpine: redbean-build
 	DOCKER_BUILDKIT=1 docker buildx build $(CURDIR) \
+		--load \
+		--file=$(CURDIR)/Dockerfile.redbean-alpine \	
+		--build-arg=ALPINE_TAG=$(ALPINE_TAG) \
+		--build-arg=GIT_REPO_OWNER=$(GIT_REPO_OWNER) \
+		--build-arg=BUILD_TAG=$(BUILD_TAG) \
 		--tag=redbean:$(REDBEAN_VERSION)-alpine \
-		--file=$(CURDIR)/Dockerfile.redbean-alpine \
-		--build-arg=ALPINE_TAG=$(ALPINE_TAG)
+		--tag=ghcr.io/$(GIT_REPO_OWNER)/redbean:$(REDBEAN_VERSION)-alpine
 
 redbean-scratch: redbean-build
 	DOCKER_BUILDKIT=1 docker buildx build $(CURDIR) \
-		--tag=redbean:$(REDBEAN_VERSION)-scratch \
-		--file=$(CURDIR)/Dockerfile.redbean-scratch
+		--load \
+		--file=$(CURDIR)/Dockerfile.redbean-scratch \
+		--build-arg=GIT_REPO_OWNER=$(GIT_REPO_OWNER) \
+		--build-arg=BUILD_TAG=$(BUILD_TAG) \
+		--tag=redbean:$(REDBEAN_VERSION) \
+		--tag=ghcr.io/$(GIT_REPO_OWNER)/redbean:$(REDBEAN_VERSION)
 
 
 # # # Lint the Dockerfile