From 2a0e1626221eb35e56302ddc66f0b22603d4e8bf Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <asalikhov@ripple.com>
Date: Thu, 12 Jun 2025 17:00:38 +0100
Subject: [PATCH] fix: Make GHCR lowercase

---
 .github/workflows/update_docker_ci.yml | 11 ++++++++---
 docker/compilers/gcc/Dockerfile        |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/update_docker_ci.yml b/.github/workflows/update_docker_ci.yml
index 5443f28f2..449040188 100644
--- a/.github/workflows/update_docker_ci.yml
+++ b/.github/workflows/update_docker_ci.yml
@@ -103,7 +103,6 @@ jobs:
     name: Merge and push multi-arch GCC docker image
     runs-on: [self-hosted, heavy]
     needs: [gcc-amd64, gcc-arm64]
-    if: ${{ github.event_name != 'pull_request' }}
 
     steps:
       - uses: actions/checkout@v4
@@ -118,6 +117,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
@@ -125,15 +125,20 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_PW }}
 
+      - name: Make GHCR_REPO lowercase
+        run: |
+          echo "GHCR_REPO_LC=$(echo ${{env.GHCR_REPO}} | tr '[:upper:]' '[:lower:]')" >> ${GITHUB_ENV}
+
       - name: Create and push multi-arch manifest
-        if: steps.changed-files.outputs.any_changed == 'true'
+        if: github.event_name != 'pull_request' && steps.changed-files.outputs.any_changed == 'true'
         run: |
-          for image in ${{ env.GHCR_REPO }}/clio-gcc rippleci/clio_gcc; do
+          for image in ${{ env.GHCR_REPO_LC }}/clio-gcc rippleci/clio_gcc; do
             docker buildx imagetools create \
               -t $image:latest \
               -t $image:12 \
diff --git a/docker/compilers/gcc/Dockerfile b/docker/compilers/gcc/Dockerfile
index f98da1d03..f18901cd8 100644
--- a/docker/compilers/gcc/Dockerfile
+++ b/docker/compilers/gcc/Dockerfile
@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG TARGETARCH
 ARG UBUNTU_VERSION=20.04
 ARG GCC_VERSION=12.3.0
-ARG BUILD_VERSION=3
+ARG BUILD_VERSION=4
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends --no-install-suggests \