Moving from CentOS namig to RHEL compatible
This commit is contained in:
parent
afa74c33c0
commit
4443b76c3f
6 changed files with 5 additions and 5 deletions
4
.github/workflows/live_artifacts.yml
vendored
4
.github/workflows/live_artifacts.yml
vendored
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
Loading…
Add table
Add a link
Reference in a new issue