From 13e0f73562ad76af3087c976c7cddbc75f6f7daf Mon Sep 17 00:00:00 2001 From: priyanshu-ctds Date: Mon, 1 Sep 2025 14:17:14 +0530 Subject: [PATCH 1/5] AS-3979: Updated the release repo to cloudtools repo --- .github/workflows/release-container-image.yml | 6 +++--- docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-container-image.yml b/.github/workflows/release-container-image.yml index 7fa7007..8b59ae7 100644 --- a/.github/workflows/release-container-image.yml +++ b/.github/workflows/release-container-image.yml @@ -20,8 +20,8 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + username: ${{ secrets.CLOUD_TOOLS_USERNAME }} + password: ${{ secrets.CLOUD_TOOLS_PASSWORD }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -47,4 +47,4 @@ jobs: with: platforms: linux/amd64,linux/arm64 push: true - tags: docker.io/datastax/pulsar-admin-console:${{ env.TAG }} + tags: registry.cloud-tools.datastax.com/datastax/pulsar-admin-console:${{ env.TAG }} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 43ade78..3e1809f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: # - './localhost.key:/certs/localhost.key' dashboard: container_name: dashboard - image: datastax/pulsar-admin-console + image: registry.cloud-tools.datastax.com/datastax/pulsar-admin-console expose: - '80' # depends_on: From 4b90556d87835379582c5cf3b3bbc333bad100bc Mon Sep 17 00:00:00 2001 From: priyanshu-ctds Date: Fri, 19 Sep 2025 09:25:16 +0530 Subject: [PATCH 2/5] Added ecr configs in release container --- .github/workflows/release-container-image.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-container-image.yml b/.github/workflows/release-container-image.yml index 8b59ae7..7fe66ee 100644 --- a/.github/workflows/release-container-image.yml +++ b/.github/workflows/release-container-image.yml @@ -20,8 +20,17 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.CLOUD_TOOLS_USERNAME }} - password: ${{ secrets.CLOUD_TOOLS_PASSWORD }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Configure AWS credentials via OIDC + uses: aws-actions/configure-aws-credentials@v5 + with: + role-to-assume: ${{ secrets.ECR_ROLE }} + aws-region: us-east-1 + + - name: Login to Amazon ECR + uses: aws-actions/amazon-ecr-login@v2 - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -47,4 +56,6 @@ jobs: with: platforms: linux/amd64,linux/arm64 push: true - tags: registry.cloud-tools.datastax.com/datastax/pulsar-admin-console:${{ env.TAG }} \ No newline at end of file + tags: | + ${{ secrets.ECR_REGISTRY }}/datastax/pulsar-admin-console:${{ env.TAG }} + docker.io/datastax/pulsar-admin-console:${{ env.TAG }} \ No newline at end of file From fdb43c2c89486646fe89438121fca76c4e9c10f0 Mon Sep 17 00:00:00 2001 From: priyanshu-ctds Date: Fri, 19 Sep 2025 09:57:48 +0530 Subject: [PATCH 3/5] Added permissions --- .github/workflows/release-container-image.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release-container-image.yml b/.github/workflows/release-container-image.yml index 7fe66ee..6614185 100644 --- a/.github/workflows/release-container-image.yml +++ b/.github/workflows/release-container-image.yml @@ -13,6 +13,10 @@ on: required: true default: 'dev' +permissions: + id-token: write + contents: read + jobs: docker: runs-on: ubuntu-latest From 1a1bc4652c38b7dbee2f0ed4eec7b3ca0f8dd050 Mon Sep 17 00:00:00 2001 From: priyanshu-ctds Date: Fri, 19 Sep 2025 21:13:47 +0530 Subject: [PATCH 4/5] Corrected case and proper separator for key value to fix warnings --- Dockerfile | 4 ++-- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a117d5f..fae7638 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16 as UI-BUILD +FROM node:16 AS ui-build WORKDIR /build @@ -35,7 +35,7 @@ WORKDIR /home/appuser/server # OpenShift compatibility RUN chmod g+w /home/appuser -ENV HOME /home/appuser +ENV HOME=/home/appuser EXPOSE 8080 8081 6454 6455 diff --git a/docker-compose.yml b/docker-compose.yml index 3e1809f..43ade78 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: # - './localhost.key:/certs/localhost.key' dashboard: container_name: dashboard - image: registry.cloud-tools.datastax.com/datastax/pulsar-admin-console + image: datastax/pulsar-admin-console expose: - '80' # depends_on: From 0aeb7247d325028316e6f8a780de2cfdef1a8501 Mon Sep 17 00:00:00 2001 From: priyanshu-ctds Date: Fri, 19 Sep 2025 21:25:03 +0530 Subject: [PATCH 5/5] corrected case of ui-build in dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fae7638..9a07315 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ WORKDIR /home/appuser/ USER 10001:0 RUN mkdir -p dashboard/dist && mkdir server && mkdir config && ls -COPY --from=UI-BUILD --chown=10001:0 /build/dist /home/appuser/dashboard/dist +COPY --from=ui-build --chown=10001:0 /build/dist /home/appuser/dashboard/dist COPY --chown=10001:0 config/default.json /home/appuser/config/ COPY --chown=10001:0 server/package*.json /home/appuser/server/ COPY --chown=10001:0 server/*.js /home/appuser/server/