feat: fix makefile

Author: vrenaville

Makefile

@@ -3,7 +3,7 @@ $(error VERSION is not set)
 endif
 
 ifeq ($(TARGET), GHCR)
-    NAME=ghcr.io/camptocamp/odoo-project
+    NAME=ghcr.io/camptocamp/docker-odoo-project
 else
     NAME=camptocamp/odoo-project
 endif
@@ -16,6 +16,9 @@ export
 
 all: build
 
+.PHONY: setup
+setup:
+	bash setup.sh
 
 .PHONY: build
 build:
@@ -25,33 +28,24 @@ build:
 .PHONY: tag
 tag:
 	docker tag $(BUILD_TAG) $(IMAGE)-$(TAG)
-	docker tag $(BUILD_TAG)-onbuild $(IMAGE)-$(TAG)-onbuild
-	docker tag $(BUILD_TAG)-batteries $(IMAGE)-$(TAG)-batteries
-	docker tag $(BUILD_TAG)-batteries-onbuild $(IMAGE)-$(TAG)-batteries-onbuild
+
 
 
 .PHONY: push
 push:
 	docker push $(IMAGE)-$(TAG)
-	docker push $(IMAGE)-$(TAG)-onbuild
-	docker push $(IMAGE)-$(TAG)-batteries
-	docker push $(IMAGE)-$(TAG)-batteries-onbuild
 
 
 .PHONY: tag_latest_main
 tag_latest_main:
 	docker tag $(BUILD_TAG) $(NAME):latest
-	docker tag $(BUILD_TAG)-onbuild $(NAME):latest-onbuild
-	docker tag $(BUILD_TAG)-batteries $(NAME):latest-batteries
-	docker tag $(BUILD_TAG)-batteries-onbuild $(NAME):latest-batteries-onbuild
+
 
 
 .PHONY: push_latest_main
 push_latest_main:
 	docker push $(NAME):latest
-	docker push $(NAME):latest-onbuild
-	docker push $(NAME):latest-batteries
-	docker push $(NAME):latest-batteries-onbuild
+
 
 
 .PHONY: test

setup.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+set -euxo pipefail
+
+#
+# Build the image
+#
+# Normally run by the Makefile:
+#
+#   $ make VERSION=$VERSION build
+#
+# It expects the following variables to be set:
+#
+# * VERSION (9.0, 10.0, 11.0, ...)
+# * BUILD_TAG (tag of the 'latest' image built)
+#
+if [ -z "$VERSION" ]; then
+    echo "VERSION environment variable is missing"
+    exit 1
+fi
+
+SRC=${SRC:=(mktemp -d)}
+echo "Creating $SRC"
+
+cp -r ${VERSION}/. $SRC/
+cp -r bin/ $SRC
+cp -rT common/ $SRC
+cp -r install/ $SRC
+cp -r start-entrypoint.d/ $SRC
+cp -r before-migrate-entrypoint.d/ $SRC