dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Moving from CentOS namig to RHEL compatible

Browse source
This commit is contained in:
Thiago Silva 2023-05-17 14:48:24 -03:00
commit 4443b76c3f
No known key found for this signature in database
GPG key ID: 034303EB8F453169
6 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/live_artifacts.yml vendored
View file

@ -78,14 +78,14 @@ jobs:
ref: ${{ github.ref }} ref: ${{ github.ref }}
repository: ${{ github.repository }} repository: ${{ github.repository }}
- name: CentOS Base - 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 - name: Build Artifact
run: | run: |
mkdir -p ${GITHUB_WORKSPACE}/artifacts mkdir -p ${GITHUB_WORKSPACE}/artifacts
docker run -e LIVE=1 -e TAG=$TAG -e REPO_TO_BUILD=$REPO_TO_BUILD -e RPM_RELEASE=1 \ 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}:/workspace \
-v ${GITHUB_WORKSPACE}/artifacts:/root/rpmbuild \ -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 - name: Deploy Artifacts
run: ci/actions/deploy.sh run: ci/actions/deploy.sh
env: env:

2
ci/actions/linux/ghcr_push.sh
View file

@ -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: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: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: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 else
tags=$(docker images --format '{{.Repository}}:{{.Tag }}' | grep "ghcr.io" | grep -vE "env|none") tags=$(docker images --format '{{.Repository}}:{{.Tag }}' | grep "ghcr.io" | grep -vE "env|none")
for a in $tags; do for a in $tags; do

2
ci/actions/linux/install_deps.sh
View file

@ -13,7 +13,7 @@ if [[ "${COMPILER:-}" != "" ]]; then
else else
ci/build-docker-image.sh docker/ci/Dockerfile-gcc nanocurrency/nano-env:gcc 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-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 fi
echo "Script ci/actions/linux/install_deps.sh finished" echo "Script ci/actions/linux/install_deps.sh finished"

0
ci/build-centos.sh → ci/build-rhel.sh
View file

2
docker/ci/Dockerfile-centos → docker/ci/Dockerfile-rhel
View file

@ -4,5 +4,5 @@ WORKDIR /workspace
ADD util /build ADD util /build
RUN bash /build/build_prep/update-common 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 RUN rm -rf /build

0
util/build_prep/centos/prep.sh.in → util/build_prep/rhel/prep.sh.in
View file