Merge pull request #2927 from pifou25/master_workflow

Docker image 4.4 based on bullseye
jeedom · Oct 6, 2024 · e5dc6e8 · e5dc6e8
2 parents b6c5caa + 6c160b8
commit e5dc6e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/install/OS_specific/Docker/init_workflow.sh → .github/scripts/init_workflow.sh b/install/OS_specific/Docker/init_workflow.sh → .github/scripts/init_workflow.sh
diff --git a/.github/workflows/docker-image-latest.yml b/.github/workflows/docker-image-latest.yml
@@ -38,7 +38,7 @@ jobs:
         # secret DOCKER_HUB_REPO is optional (default=jeedom)
         run: |
           export DOCKER_HUB_REPO=${{ secrets.DOCKER_HUB_REPO }}
-          bash install/OS_specific/Docker/init_workflow.sh
+          bash .github/scripts/init_workflow.sh
 
       - name: Set up QEMU
         # https://github.com/marketplace/actions/docker-setup-qemu
@@ -93,7 +93,7 @@ jobs:
           docker rm $(docker ps -aq) 2>&1
           docker rmi $(docker image ls -aq) 2>&1
       
-      - name: Build and push Jeedom on DockerHub
+      - name: Build and push Jeedom on Debian:Bullseye with internal DB
         # https://github.com/marketplace/actions/build-and-push-docker-images
         uses: docker/build-push-action@v3
         continue-on-error: true
@@ -104,8 +104,11 @@ jobs:
           push: true
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
-          build-args: "VERSION=${{ env.GITHUB_BRANCH }}"
-          tags: "${{ env.JEEDOM_TAGS }}"
+          build-args: |
+            "VERSION=${{ env.GITHUB_BRANCH }}"
+            "DEBIAN=bullseye"
+            "DATABASE=1"
+          tags: "${{ env.JEEDOM_REPO }}/jeedom:${{ env.JEEDOM_SHORT_VERSION}}-bullseye"
 
       - name: Clean docker image
         run: |
@@ -127,6 +130,7 @@ jobs:
           build-args: |
             "VERSION=${{ env.GITHUB_BRANCH }}"
             "DEBIAN=buster"
+            "DATABASE=1"
           tags: "${{ env.JEEDOM_REPO }}/jeedom:${{ env.JEEDOM_SHORT_VERSION}}-buster"
 
       - name: Clean docker image
@@ -135,7 +139,7 @@ jobs:
           docker rm $(docker ps -aq) 2>&1
           docker rmi $(docker image ls -aq) 2>&1
       
-      - name: Build and push Jeedom on Debian:Bookworm
+      - name: Build and push Jeedom on Debian:Bookworm as latest, 4.4 and 4.4-bookworm
         # https://github.com/marketplace/actions/build-and-push-docker-images
         uses: docker/build-push-action@v3
         continue-on-error: true
@@ -149,7 +153,8 @@ jobs:
           build-args: |
             "VERSION=${{ env.GITHUB_BRANCH }}"
             "DEBIAN=bookworm"
-          tags: "${{ env.JEEDOM_REPO }}/jeedom:${{ env.JEEDOM_SHORT_VERSION}}-bookworm"
+            "DATABASE=1"
+          tags: "${{ env.JEEDOM_REPO }}/jeedom:${{ env.JEEDOM_SHORT_VERSION}}-bookworm,${{ env.JEEDOM_TAGS }}"
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}