Makefile: implement "fully source containers" HMS-3883

Author: schuellerf

Diff for: .gitignore

@@ -11,3 +11,6 @@ dnf-json
 local.env
 __debug*
 coverage.txt
+container_built.info
+go.local.mod
+go.local.sum

Diff for: Makefile

@@ -73,3 +73,50 @@ push-check: generate build unit-tests
 	    exit 1; \
 	fi
 	@echo "All looks good - congratulations"
+
+
+# source where the other repos are locally
+# has to end with a trailing slash
+SRC_DEPS_EXTERNAL_CHECKOUT_DIR ?= ../
+
+# either "docker" or "sudo podman"
+# podman needs to build as root as it also needs to run as root afterwards
+CONTAINER_EXECUTABLE ?= sudo podman
+DOCKER_IMAGE := image-builder_devel
+DOCKERFILE := distribution/Dockerfile-ubi
+
+SRC_DEPS_EXTERNAL_NAMES := community-gateway osbuild-composer
+SRC_DEPS_EXTERNAL_DIRS := $(addprefix $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR),$(SRC_DEPS_EXTERNAL_NAMES))
+
+SRC_DEPS_DIRS := internal cmd
+
+# All files to check for rebuild!
+SRC_DEPS := $(shell find $(SRC_DEPS_DIRS) -name *.go)
+SRC_DEPS_EXTERNAL := $(shell find $(SRC_DEPS_EXTERNAL_DIRS) -name *.go)
+
+$(SRC_DEPS_EXTERNAL_DIRS):
+	@for DIR in $@; do if ! [ -d $$DIR ]; then echo "Please checkout $$DIR so it is available at $$DIR"; exit 1; fi; done
+
+GOPROXY ?= https://proxy.golang.org,direct
+
+GOMODARGS ?= -modfile=go.local.mod
+
+go.local.mod go.local.sum: $(SRC_DEPS_EXTERNAL_DIRS) go.mod $(SRC_DEPS_EXTERNAL) $(SRC_DEPS)
+	cp go.mod go.local.mod
+	cp go.sum go.local.sum
+	go mod edit $(GOMODARGS) -replace github.com/osbuild/osbuild-composer/pkg/splunk_logger=$(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)osbuild-composer/pkg/splunk_logger
+	go mod edit $(GOMODARGS) -replace github.com/osbuild/community-gateway=$(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)community-gateway
+	env GOPROXY=$(GOPROXY) go mod vendor $(GOMODARGS)
+
+container_built.info: go.local.mod $(DOCKERFILE) $(SRC_DEPS)
+	$(CONTAINER_EXECUTABLE) build -t $(DOCKER_IMAGE) -f $(DOCKERFILE) --build-arg GOMODARGS=$(GOMODARGS) .
+	echo "Container last built on" > $@
+	date >> $@
+
+.PHONY: container
+container: container_built.info
+
+.PHONY: clean
+clean:
+	rm -f container_built.info
+	rm -f go.local.*

Diff for: distribution/Dockerfile-ubi

@@ -7,7 +7,13 @@ WORKDIR $GOPATH/go/src/github.com/osbuild/image-builder
 # a repository owned by a different user.
 COPY --chown=1001 . .
 ENV GOFLAGS=-mod=vendor
-RUN go install ./...
+
+ARG GOPROXY=https://proxy.golang.org,direct
+RUN go env -w GOPROXY=$GOPROXY
+
+ARG GOMODARGS=""
+
+RUN go install $GOMODARGS ./...
 
 FROM registry.access.redhat.com/ubi9/go-toolset:latest AS builder2
 RUN go install github.com/jackc/tern@latest