From e2a0c030d589ced4ccfbd191155f143cd4252133 Mon Sep 17 00:00:00 2001
From: Alexander Dobrodey <8377544+ADobrodey@users.noreply.github.com>
Date: Wed, 19 Jul 2023 19:33:02 +0200
Subject: [PATCH] Test with old credentials

---
 .github/workflows/dev.yml | 21 ++++++++++++---------
 Dockerfile-new            |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 05ee4dfb7..f850a0639 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -43,7 +43,10 @@ jobs:
 
       - name: Get short SHA
         run: |
-          echo GITHUB_SHA=${GITHUB_SHA:0:7} >> $GITHUB_ENV
+          echo "GITHUB_SHA=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
+          echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
+          echo "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
+          echo "AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN" >> $GITHUB_ENV
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -54,17 +57,17 @@ jobs:
           context: .
           file: ./Dockerfile-new
           push: true
-          build-args: |
-            "AWS_ACCESS_KEY_ID=${{ secrets.DEV_NETWORK_AWS_ACCESS_KEY_ID }}"
-            "AWS_SECRET_ACCESS_KEY=${{ secrets.DEV_NETWORK_AWS_SECRET_ACCESS_KEY }}"
-            "SCCACHE_REGION=us-west-2"
-            "SCCACHE_BUCKET=cere-blockchain-sccache"
 #          build-args: |
-#            "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID"
-#            "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY"
-#            "AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN"
+#            "AWS_ACCESS_KEY_ID=${{ secrets.DEV_NETWORK_AWS_ACCESS_KEY_ID }}"
+#            "AWS_SECRET_ACCESS_KEY=${{ secrets.DEV_NETWORK_AWS_SECRET_ACCESS_KEY }}"
 #            "SCCACHE_REGION=us-west-2"
 #            "SCCACHE_BUCKET=cere-blockchain-sccache"
+          build-args: |
+            "AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }}"
+            "AWS_SECRET_ACCESS_KEY=${{ env.AWS_SECRET_ACCESS_KEY }}"
+            "AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }}"
+            "SCCACHE_REGION=us-west-2"
+            "SCCACHE_BUCKET=cere-blockchain-sccache"
 
           tags: |
             ${{ steps.login-ecr.outputs.registry }}/pos-network-node:${{ github.sha }}
diff --git a/Dockerfile-new b/Dockerfile-new
index 909c3c800..b4d8e9440 100644
--- a/Dockerfile-new
+++ b/Dockerfile-new
@@ -28,7 +28,7 @@ ENV RUSTC_WRAPPER=/usr/local/bin/sccache
 # Installation script is taken from https://grpc.io/docs/protoc-installation/
 ENV PROTOC_VERSION=3.15.8
 RUN PB_REL="https://github.com/protocolbuffers/protobuf/releases" && \
-    curl -LO $PB_REL/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && \
+    curl -sLO $PB_REL/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && \
     mkdir -p /usr/local/protoc && \
     unzip protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /usr/local/protoc && \
     chmod +x /usr/local/protoc/bin/protoc && \