fix: error with base64 -b (MAC) use -w, speed up integration test- wi…

…th simple Dockerfile
nais · Jun 16, 2022 · 871091f · 871091f
1 parent 233d964
commit 871091f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,2 @@
+FROM ubuntu:22.10
+RUN apt-get update