fixup! fixup! fixup! fix: error on print report

camptocamp · Sep 26, 2024 · 3901cd9 · 3901cd9
1 parent 96e008e
commit 3901cd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 33 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -66,11 +66,11 @@ jobs:
           context: ./build
           push: false
           load: true
-          tags: ${{ steps.docker_meta.outputs.tags }}
+          tags: ci-5xx-latest:${{ matrix.odoo_serie }}
           labels: ${{ steps.docker_meta.outputs.labels }}
 
       - name: Test
-        run: export BASE_IMAGE=${{ matrix.odoo_serie }}:latest; make VERSION=${{ matrix.odoo_serie }} test
+        run: make VERSION=${{ matrix.odoo_serie }} test
 
       - name: Login to GitHub Container Registry
         if: github.event_name == 'push' || github.event_name == 'schedule'

diff --git a/Makefile b/Makefile
@@ -2,14 +2,7 @@ ifndef VERSION
 $(error VERSION is not set)
 endif
 
-ifeq ($(TARGET), GHCR)
-    NAME=ghcr.io/camptocamp/docker-odoo-project
-else
-    NAME=camptocamp/odoo-project
-endif
-
-IMAGE=$(NAME):$(VERSION)
-IMAGE_LATEST=$(IMAGE)-latest
+IMAGE_LATEST=ci-fxx-latest:${VERSION}
 BUILD_TAG=$(IMAGE_LATEST)
 
 export
@@ -20,29 +13,6 @@ all: build
 setup:
 	bash setup.sh
 
-.PHONY: build
-build:
-	bash build.sh
-
-.PHONY: tag
-tag:
-	docker tag $(BUILD_TAG) $(IMAGE)-$(TAG)
-
-
-.PHONY: push
-push:
-	docker push $(IMAGE)-$(TAG)
-
-
-.PHONY: tag_latest_main
-tag_latest_main:
-	docker tag $(BUILD_TAG) $(NAME):latest
-
-
-.PHONY: push_latest_main
-push_latest_main:
-	docker push $(NAME):latest
-
 
 .PHONY: test
 test: