Merge pull request #1 from ems-project/feat/5.x-improvements

Feat/5.x improvements

Author: theus77

.build.env

@@ -1,2 +1,5 @@
-ELASTICMS_CLIENT_VERSION=4.3.1
-DOCKER_IMAGE_NAME=docker.io/elasticms/cli
+# Default Docker image name
+DOCKER_IMAGE_NAME=docker.io/elasticms/cli
+
+# Default ElasticMS CLI Version
+ELASTICMS_CLI_VERSION=5.1.2

.github/workflows/docker-build.yml

@@ -10,6 +10,10 @@ jobs:
 
   build-docker-images:
 
+    strategy:
+      matrix:
+        image-variant: [prd,dev]
+
     runs-on: ubuntu-20.04
 
     steps:
@@ -29,14 +33,14 @@ jobs:
           echo "docker-image-name=${DOCKER_IMAGE_NAME}" >> $GITHUB_OUTPUT
           echo "build-date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
 
-      - name: Fill Docker Image metadata
+      - name: Fill "${{ steps.prep.outputs.docker-image-name }}" Docker Image metadata
         id: meta
         uses: docker/metadata-action@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           images: "${{ steps.prep.outputs.docker-image-name }}"
           tags: |
-            type=raw,value=rc
+            type=raw,value=rc-${{ matrix.image-variant }}
 
       - name: Set up Docker Buildx
         id: buildx
@@ -50,36 +54,30 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
 
-      - name: Build Docker Image
+      - name: Build "${{ steps.prep.outputs.docker-image-name }}" Docker Image
         id: build
         uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
           file: Dockerfile
+          target: ${{ matrix.image-variant }}
           build-args: |
-            VERSION_ARG=${{ env.ELASTICMS_ADMIN_VERSION }}
+            VERSION_ARG=${{ env.ELASTICMS_CLI_VERSION }}
             RELEASE_ARG=${{ env.CI_RUN_ID }}
             VCS_REF_ARG=${{ env.CI_SHA }}
             BUILD_DATE_ARG=${{ steps.prep.outputs.build-date }}
           push: false
           load: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=docker,dest=/tmp/myimage.tar
+          outputs: type=docker,dest=/tmp/image.tar
 
-      - name: Squash Docker Image
-        id: squash
+      - name: Load Docker Image
         run: |
-          pip install docker-squash
-          cat /tmp/myimage.tar | docker load
-          docker-squash --verbose --message "Build and Squashed in GitHub Action" \
-            --tag ${{ steps.prep.outputs.docker-image-name }}:rc \
-            --output-path /tmp/myimage.tar \
-            ${{ steps.prep.outputs.docker-image-name }}:rc
-          cat /tmp/myimage.tar | docker load
+          docker load --input /tmp/image.tar
 
       - name: Check Docker Image
         run: |
-          docker image inspect ${{ steps.prep.outputs.docker-image-name }}:rc
-          docker history ${{ steps.prep.outputs.docker-image-name }}:rc
+          docker image inspect ${{ steps.prep.outputs.docker-image-name }}:rc-${{ matrix.image-variant }}
+          docker history ${{ steps.prep.outputs.docker-image-name }}:rc-${{ matrix.image-variant }}