From 871091feec4d081347303c4ee38f707e10cc38ca Mon Sep 17 00:00:00 2001
From: ybelMekk <youssef.bel.mekki@nav.no>
Date: Thu, 16 Jun 2022 15:28:06 +0200
Subject: [PATCH] fix: error with base64 -b (MAC) use -w, speed up integration
 test- with simple Dockerfile

---
 .github/workflows/nais-salsa-integration.yml | 3 ++-
 entrypoint.sh                                | 6 +++---
 integration-test/Dockerfile                  | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 integration-test/Dockerfile

diff --git a/.github/workflows/nais-salsa-integration.yml b/.github/workflows/nais-salsa-integration.yml
index 0b89b11..0f37b07 100755
--- a/.github/workflows/nais-salsa-integration.yml
+++ b/.github/workflows/nais-salsa-integration.yml
@@ -5,7 +5,7 @@ on:
     types: [completed]
     branches: [main]
 env:
-  IMAGE: ttl.sh/nais/salsa-test:1h
+  IMAGE: ttl.sh/nais/salsa-integration-test:1h
 jobs:
   on-failure:
     runs-on: ubuntu-20.04
@@ -30,6 +30,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@e551b19e49efd4e98792db7592c17c09b89db8d8 # ratchet:docker/build-push-action@v3
         with:
+          context: integration-test
           push: true
           tags: ${{ env.IMAGE }}
       # Added to a workflow
diff --git a/entrypoint.sh b/entrypoint.sh
index 3734a5c..bf4378a 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -32,9 +32,9 @@ setup() {
     exit 1
   fi
 
-  GITHUB=$(echo "${INPUT_GITHUB_CONTEXT}" | base64 -b 0) &&
-    RUNNER=$(echo "${INPUT_RUNNER_CONTEXT}" | base64 -b 0) &&
-    ENVS=$(jq -n env | base64 -b 0)
+  GITHUB=$(echo "${INPUT_GITHUB_CONTEXT}" | base64 -w 0) &&
+    RUNNER=$(echo "${INPUT_RUNNER_CONTEXT}" | base64 -w 0) &&
+    ENVS=$(jq -n env | base64 -w 0)
 
   DOCKER_REGISTRY="${IMAGE%%/*}"
   if [ -z "$DOCKER_REGISTRY" ]; then
diff --git a/integration-test/Dockerfile b/integration-test/Dockerfile
new file mode 100644
index 0000000..20ddc82
--- /dev/null
+++ b/integration-test/Dockerfile
@@ -0,0 +1,2 @@
+FROM ubuntu:22.10
+RUN apt-get update
\ No newline at end of file