WIP: make scratch directory in a better location

and also MAC compatible

Author: schuellerf

Makefile

@@ -45,11 +45,12 @@ $(COMMON_SRC_DEPS_ORIGIN) $(SERVICE_SRC_DEPS_ORIGIN) $(ONPREM_SRC_DEPS_ORIGIN):
 
 COMPARE_TO_BRANCH ?= origin/main
 
-SCRATCH_DIR := /private/tmp/scratch/
+SCRATCH_DIR := $(HOME)/.cache/osbuild-getting-started/scratch
+export SCRATCH_DIR
 COMMON_DIR := podman/image-builder-config
 CLI_DIRS := podman/weldr podman/cloudapi podman/dnf-json
 DATA_DIR := data/s3/service
-ALL_SCRATCH_DIRS := $(addprefix $(SCRATCH_DIR),$(COMMON_DIR) $(CLI_DIRS) $(DATA_DIR))
+ALL_SCRATCH_DIRS := $(addprefix $(SCRATCH_DIR)/,$(COMMON_DIR) $(CLI_DIRS) $(DATA_DIR))
 
 # internal rule for sub-calls
 # NOTE: This chowns all directories back - as we expect to run partly as root
@@ -74,7 +75,7 @@ service_sub_make_frontend:
 service_sub_make_cleanup:
 	@for DIR in $(COMMON_SRC_DEPS_ORIGIN) $(SERVICE_SRC_DEPS_ORIGIN); do echo "Giving directory permissions in '$$DIR' back to '$(SUDO_USER)'"; chown -R $(SUDO_USER): $$DIR || sudo chown -R $(SUDO_USER): $$DIR; done
 	@echo "Your current versions are (comparing to origin/main):"
-	bash -c './git_stack.sh'
+	bash -c './tools/git_stack.sh'
 
 .PHONY: service_sub_makes_no_frontend
 service_sub_makes_no_frontend: service_sub_make_backend service_sub_make_cleanup
@@ -88,7 +89,7 @@ onprem_sub_makes:
 	$(MAKE_SUB_CALL) -C $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)weldr-client container
 	@for DIR in $(COMMON_SRC_DEPS_ORIGIN) $(ONPREM_SRC_DEPS_ORIGIN); do echo "Giving directory permissions in '$$DIR' back to '$(SUDO_USER)'"; chown -R $(SUDO_USER): $$DIR || sudo chown -R $(SUDO_USER): $$DIR; done
 	@echo "Your current versions are (comparing to origin/main):"
-	./git_stack.sh
+	bash -c './tools/git_stack.sh'
 
 .PHONY: service_containers
 service_containers: $(COMMON_SRC_DEPS_ORIGIN) $(SERVICE_SRC_DEPS_ORIGIN) common_sub_makes service_sub_makes service_images_built.info
@@ -100,13 +101,13 @@ onprem_containers: $(COMMON_SRC_DEPS_ORIGIN) $(ONPREM_SRC_DEPS_ORIGIN) common_su
 
 service_images_built.info: service/config/Dockerfile-config service/config/composer/osbuild-composer.toml $(ALL_SCRATCH_DIRS)
 	# building remaining containers (config, fauxauth)
-	$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose.yml build --build-arg CONFIG_BUILD_DATE=$(shell date -r $(SCRATCH_DIR)$(COMMON_DIR) +%Y%m%d_%H%M%S)
+	$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose.yml build --build-arg CONFIG_BUILD_DATE=$(shell date -r $(SCRATCH_DIR)/$(COMMON_DIR) +%Y%m%d_%H%M%S)
 	echo "Images last built on" > $@
 	date >> $@
 
 onprem_images_built.info: service/config/Dockerfile-config-onprem service/config/composer/osbuild-composer-onprem.toml $(ALL_SCRATCH_DIRS)
 	# building remaining containers (config)
-	$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose-onprem.yml build --build-arg CONFIG_BUILD_DATE=$(shell date -r $(SCRATCH_DIR)$(COMMON_DIR) +%Y%m%d_%H%M%S)
+	$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose-onprem.yml build --build-arg CONFIG_BUILD_DATE=$(shell date -r $(SCRATCH_DIR)/$(COMMON_DIR) +%Y%m%d_%H%M%S)
 	echo "Images last built on" > $@
 	date >> $@
 
@@ -116,23 +117,25 @@ $(ALL_SCRATCH_DIRS):
 
 .PHONY: wipe_config
 wipe_config:
-	sudo rm -rf $(SCRATCH_DIR)$(COMMON_DIR)
+	sudo rm -rf $(SCRATCH_DIR)/$(COMMON_DIR)
 	rm -f $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)image-builder-frontend/node_modules/.cache/webpack-dev-server/server.pem
 
 .PHONY: clean
 clean: $(COMMON_SRC_DEPS_ORIGIN) $(SERVICE_SRC_DEPS_ORIGIN) $(ONPREM_SRC_DEPS_ORIGIN) prune_service prune_onprem wipe_config
 	rm -f service_images_built.info
 	rm -f onprem_images_built.info
-	sudo rm -rf $(SCRATCH_DIR)
+	rm -rf $(SCRATCH_DIR) || (echo "Trying as root" ;sudo rm -rf $(SCRATCH_DIR))
 	for DIR in $*; do $(MAKE_SUB_CALL) -C $$DIR clean; done
-	$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose.yml rm
-	$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose-onprem.yml rm
+	$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose.yml down --volumes
+	$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose.yml rm --volumes
+	$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose-onprem.yml down --volumes
+	$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose-onprem.yml rm --volumes	
 
 # for compatibility of relative volume mount paths
 # between docker and podman we have to change to the directory
 .PHONY: run_service
 .ONESHELL:
-run_service: $(addprefix $(SCRATCH_DIR),$(COMMON_DIRS)) service_containers
+run_service: $(addprefix $(SCRATCH_DIR)/,$(COMMON_DIRS)) service_containers
 	export PORTS="$(shell docker compose -f service/docker-compose.yml config|grep -Po '(?<=published: ")[0-9]+')"
 	echo "-- Checking if any of our ports are used: $$PORTS"
 	sudo netstat -lntp|grep -E "$$(echo "$$PORTS"|tr ' ' ':')"
@@ -168,10 +171,10 @@ prune_onprem:
 # between docker and podman we have to change to the directory
 .PHONY: run_onprem
 .ONESHELL:
-run_onprem: $(addprefix $(SCRATCH_DIR),$(COMMON_DIRS) $(CLI_DIRS)) onprem_containers
+run_onprem: $(addprefix $(SCRATCH_DIR)/,$(COMMON_DIRS) $(CLI_DIRS)) onprem_containers
 	cd service
 	echo "Remove dangling sockets as root"
-	sudo rm -f $(addsuffix /api.sock*, $(addprefix $(SCRATCH_DIR), $(CLI_DIRS)))
+	sudo rm -f $(addsuffix /api.sock*, $(addprefix $(SCRATCH_DIR)/, $(CLI_DIRS)))
 	$(CONTAINER_COMPOSE_EXECUTABLE) -f docker-compose-onprem.yml up -d
 	@echo "------ Welcome to osbuild! You can now use 'composer-cli' to build images"
 	@echo "       … and 'exit' afterwards"
@@ -191,8 +194,9 @@ docs: docs/src_compile_service.svg docs/src_compile_onprem.svg
 overview:
 	@echo "Fetching all repos for better overview if rebase will be necessary:"
 ifeq (${SUDO_USER},$(shell whoami))
-	./git_stack.sh fetch --all
+	bash -c './tools/git_stack.sh fetch --all'
 else
-	sudo -u ${SUDO_USER} ./git_stack.sh fetch --all
+	sudo -u ${SUDO_USER} bash -c './tools/git_stack.sh fetch --all'
 endif
-	@./git_stack.sh
+	@bash -c './tools/git_stack.sh'
+

service/docker-compose.yml

@@ -10,7 +10,7 @@ volumes:
     driver_opts:
       type: none
       # this can be modified as desired
-      device: /private/tmp/scratch/podman/image-builder-config
+      device: ${SCRATCH_DIR:-/scratch}/podman/image-builder-config
       o: bind
 
 services:
@@ -194,7 +194,7 @@ services:
     image: docker.io/minio/minio:latest
     volumes:
       # this can be modified as desired
-      - /private/tmp/scratch/data/s3:/data:z
+      - ${SCRATCH_DIR:-/scratch}/data/s3:/data:z
     command: server /data --console-address ":9090"
     working_dir: /data
     environment:

git_stack.sh renamed to tools/git_stack.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # repos to respect
-BASEDIR=$(dirname $(readlink -f $0))/..
+BASEDIR=$(dirname $(readlink -f $0))/../..
 REPOS="osbuild-getting-started osbuild osbuild-composer images image-builder image-builder-frontend weldr-client"
 REPOS="$REPOS pulp-client community-gateway"