From 9ca292f3c09c799959f2d3dc0a24dc1444a7e4e4 Mon Sep 17 00:00:00 2001 From: Nathan Klick Date: Fri, 22 Mar 2024 16:36:17 -0500 Subject: [PATCH] chore: rename production next image Signed-off-by: Nathan Klick --- .../generate-docker-artifact-baseline.sh | 2 +- .../zxc-publish-production-image.yaml | 24 +++++++++---------- .../zxc-verify-docker-build-determinism.yaml | 4 ++-- .../Dockerfile | 0 .../entrypoint.sh | 2 +- .../repro-sources-list.sh | 0 6 files changed, 16 insertions(+), 16 deletions(-) rename hedera-node/infrastructure/docker/containers/production-next/{hedera-network-node => consensus-node}/Dockerfile (100%) rename hedera-node/infrastructure/docker/containers/production-next/{hedera-network-node => consensus-node}/entrypoint.sh (99%) rename hedera-node/infrastructure/docker/containers/production-next/{hedera-network-node => consensus-node}/repro-sources-list.sh (100%) diff --git a/.github/workflows/support/scripts/generate-docker-artifact-baseline.sh b/.github/workflows/support/scripts/generate-docker-artifact-baseline.sh index 64f6ca27c84a..319776abe78f 100755 --- a/.github/workflows/support/scripts/generate-docker-artifact-baseline.sh +++ b/.github/workflows/support/scripts/generate-docker-artifact-baseline.sh @@ -2,7 +2,7 @@ set -o pipefail set +e -readonly DOCKER_IMAGE_NAME="hedera-network-node" +readonly DOCKER_IMAGE_NAME="consensus-node" GROUP_ACTIVE="false" diff --git a/.github/workflows/zxc-publish-production-image.yaml b/.github/workflows/zxc-publish-production-image.yaml index 87b0e498d486..c4f16884e683 100644 --- a/.github/workflows/zxc-publish-production-image.yaml +++ b/.github/workflows/zxc-publish-production-image.yaml @@ -20,7 +20,7 @@ on: description: "Custom Job Name:" required: false type: string - default: "GCP" + default: "Publish Production Image (GCP)" outputs: docker-image: description: "Docker Image:" @@ -39,10 +39,10 @@ permissions: jobs: publish-image: - name: ${{ inputs.custom-job-name || 'GCP' }} + name: ${{ inputs.custom-job-name || 'Publish Production Image (GCP)' }} runs-on: [self-hosted, Linux, large, ephemeral] outputs: - docker-image: ${{ steps.set-registry.outputs.docker-tag-base }}/hedera-network-node:${{ inputs.version }} + docker-image: ${{ steps.set-registry.outputs.docker-tag-base }}/consensus-node:${{ inputs.version }} steps: - name: Checkout Code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -151,10 +151,10 @@ jobs: - name: Stage SDK Artifacts run: | - mkdir -p hedera-node/infrastructure/docker/containers/production-next/hedera-network-node/sdk - cp -rvf ~/artifact-build/* hedera-node/infrastructure/docker/containers/production-next/hedera-network-node/sdk/ + mkdir -p hedera-node/infrastructure/docker/containers/production-next/consensus-node/sdk + cp -rvf ~/artifact-build/* hedera-node/infrastructure/docker/containers/production-next/consensus-node/sdk/ - - name: Build Network Node Image + - name: Build Consensus Node Image uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0 env: SOURCE_DATE_EPOCH: ${{ steps.commit.outputs.source-date }} @@ -164,15 +164,15 @@ jobs: platforms: linux/amd64,linux/arm64 build-args: | SOURCE_DATE_EPOCH=${{ steps.commit.outputs.source-date }} - context: hedera-node/infrastructure/docker/containers/production-next/hedera-network-node - tags: ${{ steps.set-registry.outputs.docker-tag-base }}/hedera-network-node:${{ inputs.version }} + context: hedera-node/infrastructure/docker/containers/production-next/consensus-node + tags: ${{ steps.set-registry.outputs.docker-tag-base }}/consensus-node:${{ inputs.version }} - name: Render Job Summary run: | - NETWORK_NODE_MAIN_LINK="Not Applicable" + CONSENSUS_NODE_LINK="Not Applicable" if [[ "${{ inputs.dry-run-enabled }}" != true ]]; then - NETWORK_NODE_MAIN_LINK="[GCP Console](https://${{ steps.set-registry.outputs.docker-tag-base }}/hedera-network-node:${{ inputs.version }})" + CONSENSUS_NODE_LINK="[GCP Console](https://${{ steps.set-registry.outputs.docker-tag-base }}/consensus-node:${{ inputs.version }})" fi printf "### Published Docker Images\n" >> "${GITHUB_STEP_SUMMARY}" @@ -180,9 +180,9 @@ jobs: printf "| ---------- | ------- | --- | ----------------------- |\n" >> "${GITHUB_STEP_SUMMARY}" printf "| %s | %s | %s | %s |\n" \ - "${{ steps.set-registry.outputs.docker-tag-base }}/main-network-node" \ + "${{ steps.set-registry.outputs.docker-tag-base }}/consensus-node" \ "${{ inputs.version }}" \ - "${NETWORK_NODE_MAIN_LINK}" \ + "${CONSENSUS_NODE_LINK}" \ "linux/amd64, linux/arm64" >> "${GITHUB_STEP_SUMMARY}" printf "\n\n" >> "${GITHUB_STEP_SUMMARY}" diff --git a/.github/workflows/zxc-verify-docker-build-determinism.yaml b/.github/workflows/zxc-verify-docker-build-determinism.yaml index 4a64fcd4bcdb..b53477f4f4c2 100644 --- a/.github/workflows/zxc-verify-docker-build-determinism.yaml +++ b/.github/workflows/zxc-verify-docker-build-determinism.yaml @@ -56,8 +56,8 @@ env: DOCKER_MANIFEST_GENERATOR: .github/workflows/support/scripts/generate-docker-artifact-baseline.sh DOCKER_MANIFEST_PATH: ${{ github.workspace }}/.manifests/docker DOCKER_REGISTRY: localhost:5000 - DOCKER_IMAGE_NAME: hedera-network-node - DOCKER_CONTEXT_PATH: hedera-node/infrastructure/docker/containers/production-next/hedera-network-node + DOCKER_IMAGE_NAME: consensus-node + DOCKER_CONTEXT_PATH: hedera-node/infrastructure/docker/containers/production-next/consensus-node SKOPEO_VERSION: v1.14.0 jobs: diff --git a/hedera-node/infrastructure/docker/containers/production-next/hedera-network-node/Dockerfile b/hedera-node/infrastructure/docker/containers/production-next/consensus-node/Dockerfile similarity index 100% rename from hedera-node/infrastructure/docker/containers/production-next/hedera-network-node/Dockerfile rename to hedera-node/infrastructure/docker/containers/production-next/consensus-node/Dockerfile diff --git a/hedera-node/infrastructure/docker/containers/production-next/hedera-network-node/entrypoint.sh b/hedera-node/infrastructure/docker/containers/production-next/consensus-node/entrypoint.sh similarity index 99% rename from hedera-node/infrastructure/docker/containers/production-next/hedera-network-node/entrypoint.sh rename to hedera-node/infrastructure/docker/containers/production-next/consensus-node/entrypoint.sh index 03a3d3116c59..f42a5b1a435c 100644 --- a/hedera-node/infrastructure/docker/containers/production-next/hedera-network-node/entrypoint.sh +++ b/hedera-node/infrastructure/docker/containers/production-next/consensus-node/entrypoint.sh @@ -83,7 +83,7 @@ cat <