From 4930941ba9dbe27bb134104c04d9da793dfec806 Mon Sep 17 00:00:00 2001
From: Brot & Games <43862266+brotandgames@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:53:34 +0200
Subject: [PATCH] Update CI Workflow for Conditional Docker Image Push (#159)

* Update CI Workflow for Conditional Docker Image Push

- Modified the CI workflow to separate the Docker image build and push actions
- Introduced a conditional step for pushing: images are now only pushed if the tag does not contain `-rc`
- Ensures that all tagged images, including `-rcX` versions, are built, but only stable releases are pushed
- Enhances flexibility and control over the release process in the CI pipeline

* Upgrade ruby from 3.3.0 to 3.3.1
---
 .github/workflows/docker.yml | 13 ++++++++++++-
 .ruby-version                |  2 +-
 Dockerfile                   |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7a8ae5b..2d81914 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -11,16 +11,27 @@ jobs:
     steps:
       - name: checkout code
         uses: actions/checkout@v2
+
       - name: install buildx
         id: buildx
         uses: crazy-max/ghaction-docker-buildx@v1
         with:
           version: latest
+
       - name: login to docker hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-      - name: build and push the image
+
+      - name: build the image
+        run: |
+          docker buildx build \
+            --tag brotandgames/ciao:$(cat ./public/version) \
+            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+
+      - name: push the image
+        if: "!contains(github.ref, '-rc')"
         run: |
           docker buildx build --push \
             --tag brotandgames/ciao:$(cat ./public/version) \
             --tag brotandgames/ciao:latest \
             --platform linux/amd64,linux/arm/v7,linux/arm64 .
+
diff --git a/.ruby-version b/.ruby-version
index 15a2799..bea438e 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.0
+3.3.1
diff --git a/Dockerfile b/Dockerfile
index 4b46895..89dddb9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.3.0-alpine3.18
+FROM ruby:3.3.1-alpine3.18
 
 # for postgres: postgresql-dev
 RUN apk add --no-cache \