From 4443b76c3fbd7be20afe816b0bcbbf150233ac8e Mon Sep 17 00:00:00 2001
From: Thiago Silva <thiago@nano.org>
Date: Wed, 17 May 2023 14:48:24 -0300
Subject: [PATCH] Moving from CentOS namig to RHEL compatible

---
 .github/workflows/live_artifacts.yml             | 4 ++--
 ci/actions/linux/ghcr_push.sh                    | 2 +-
 ci/actions/linux/install_deps.sh                 | 2 +-
 ci/{build-centos.sh => build-rhel.sh}            | 0
 docker/ci/{Dockerfile-centos => Dockerfile-rhel} | 2 +-
 util/build_prep/{centos => rhel}/prep.sh.in      | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename ci/{build-centos.sh => build-rhel.sh} (100%)
 rename docker/ci/{Dockerfile-centos => Dockerfile-rhel} (72%)
 rename util/build_prep/{centos => rhel}/prep.sh.in (100%)

diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml
index 4fa94b02..765b97a6 100644
--- a/.github/workflows/live_artifacts.yml
+++ b/.github/workflows/live_artifacts.yml
@@ -78,14 +78,14 @@ jobs:
           ref: ${{ github.ref }}
           repository: ${{ github.repository }}
       - name: CentOS Base
-        run: ci/build-docker-image.sh docker/ci/Dockerfile-centos nanocurrency/nano-env:centos
+        run: ci/build-docker-image.sh docker/ci/Dockerfile-rhel nanocurrency/nano-env:rhel
       - name: Build Artifact
         run: |
           mkdir -p ${GITHUB_WORKSPACE}/artifacts
           docker run -e LIVE=1 -e TAG=$TAG -e REPO_TO_BUILD=$REPO_TO_BUILD -e RPM_RELEASE=1 \
           -v ${GITHUB_WORKSPACE}:/workspace \
           -v ${GITHUB_WORKSPACE}/artifacts:/root/rpmbuild \
-          nanocurrency/nano-env:centos /bin/bash -c "ci/build-centos.sh"
+          nanocurrency/nano-env:rhel /bin/bash -c "ci/build-rhel.sh"
       - name: Deploy Artifacts
         run: ci/actions/deploy.sh
         env:
diff --git a/ci/actions/linux/ghcr_push.sh b/ci/actions/linux/ghcr_push.sh
index 7257ec04..89ac8ac8 100755
--- a/ci/actions/linux/ghcr_push.sh
+++ b/ci/actions/linux/ghcr_push.sh
@@ -6,7 +6,7 @@ if [[ "$GITHUB_WORKFLOW" = "Develop Branch Dockers Deploy" ]]; then
     "$scripts"/custom-timeout.sh 30 docker push "ghcr.io/${GITHUB_REPOSITORY}/nano-env:base"
     "$scripts"/custom-timeout.sh 30 docker push "ghcr.io/${GITHUB_REPOSITORY}/nano-env:gcc"
     "$scripts"/custom-timeout.sh 30 docker push "ghcr.io/${GITHUB_REPOSITORY}/nano-env:clang"
-    "$scripts"/custom-timeout.sh 30 docker push "ghcr.io/${GITHUB_REPOSITORY}/nano-env:centos"
+    "$scripts"/custom-timeout.sh 30 docker push "ghcr.io/${GITHUB_REPOSITORY}/nano-env:rhel"
 else
     tags=$(docker images --format '{{.Repository}}:{{.Tag }}' | grep "ghcr.io" | grep -vE "env|none")
     for a in $tags; do
diff --git a/ci/actions/linux/install_deps.sh b/ci/actions/linux/install_deps.sh
index f0af57c2..847a5f07 100755
--- a/ci/actions/linux/install_deps.sh
+++ b/ci/actions/linux/install_deps.sh
@@ -13,7 +13,7 @@ if [[ "${COMPILER:-}" != "" ]]; then
 else
     ci/build-docker-image.sh docker/ci/Dockerfile-gcc nanocurrency/nano-env:gcc
     ci/build-docker-image.sh docker/ci/Dockerfile-clang nanocurrency/nano-env:clang
-    ci/build-docker-image.sh docker/ci/Dockerfile-centos nanocurrency/nano-env:centos
+    ci/build-docker-image.sh docker/ci/Dockerfile-rhel nanocurrency/nano-env:rhel
 fi
 
 echo "Script ci/actions/linux/install_deps.sh finished"
diff --git a/ci/build-centos.sh b/ci/build-rhel.sh
similarity index 100%
rename from ci/build-centos.sh
rename to ci/build-rhel.sh
diff --git a/docker/ci/Dockerfile-centos b/docker/ci/Dockerfile-rhel
similarity index 72%
rename from docker/ci/Dockerfile-centos
rename to docker/ci/Dockerfile-rhel
index f295845e..e68f4faa 100644
--- a/docker/ci/Dockerfile-centos
+++ b/docker/ci/Dockerfile-rhel
@@ -4,5 +4,5 @@ WORKDIR /workspace
 
 ADD util /build
 RUN bash /build/build_prep/update-common
-RUN bash /build/build_prep/centos/prep.sh
+RUN bash /build/build_prep/rhel/prep.sh
 RUN rm -rf /build
diff --git a/util/build_prep/centos/prep.sh.in b/util/build_prep/rhel/prep.sh.in
similarity index 100%
rename from util/build_prep/centos/prep.sh.in
rename to util/build_prep/rhel/prep.sh.in