fix: shellcheck warnings on image build workflows

uselagoon · Nov 19, 2024 · c65de83 · c65de83
1 parent e3e7ca0
commit c65de83
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 35 deletions.
diff --git a/.github/workflows/athenapdf-service-image.yaml b/.github/workflows/athenapdf-service-image.yaml
@@ -44,25 +44,25 @@ jobs:
         name: Create SERVICE_TAG variable
         id: service_tag_var
         run: |
-          RAW_TAG=$(echo $(git describe --abbrev=0 --tags --match 'athenapdf-service-*'))
+          RAW_TAG=$(git describe --abbrev=0 --tags --match 'athenapdf-service-*')
           SERVICE_TAG=${RAW_TAG#"athenapdf-service-"}
           echo "using athenapdf-service tag $SERVICE_TAG"
-          echo "SERVICE_TAG=$SERVICE_TAG" >> $GITHUB_ENV
+          echo "SERVICE_TAG=$SERVICE_TAG" >> "$GITHUB_ENV"
       -
         name: Set version for non-tag build
         if: "!startsWith(github.ref, 'refs/tags/athenapdf-service')"
         id: version_non-tag_build
         run: |
-          DOCKER_TAG=${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          DOCKER_TAG="${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)"
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "athenapdf-service version $DOCKER_TAG"
       -
         name: Set version for tag build
         if: "startsWith(github.ref, 'refs/tags/athenapdf-service')"
         id: version_tag_build
         run: |
           DOCKER_TAG=${{ env.SERVICE_TAG }}
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "athenapdf-service version $DOCKER_TAG"
       -
         name: Docker meta

diff --git a/.github/workflows/database-tools-image.yaml b/.github/workflows/database-tools-image.yaml
@@ -43,25 +43,25 @@ jobs:
         name: Create SERVICE_TAG variable
         id: service_tag_var
         run: |
-          RAW_TAG=$(echo $(git describe --abbrev=0 --tags --match 'database-tools-*'))
+          RAW_TAG=$(git describe --abbrev=0 --tags --match 'database-tools-*')
           SERVICE_TAG=${RAW_TAG#"database-tools-"}
           echo "using database-tools tag $SERVICE_TAG"
-          echo "SERVICE_TAG=$SERVICE_TAG" >> $GITHUB_ENV
+          echo "SERVICE_TAG=$SERVICE_TAG" >> "$GITHUB_ENV"
       -
         name: Set version for non-tag build
         if: "!startsWith(github.ref, 'refs/tags/database-tools')"
         id: version_non-tag_build
         run: |
-          DOCKER_TAG=${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          DOCKER_TAG="${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)"
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "database-tools version $DOCKER_TAG"
       -
         name: Set version for tag build
         if: "startsWith(github.ref, 'refs/tags/database-tools')"
         id: version_tag_build
         run: |
           DOCKER_TAG=${{ env.SERVICE_TAG }}
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "database-tools version $DOCKER_TAG"
       -
         name: Docker meta

diff --git a/.github/workflows/docker-host-image.yaml b/.github/workflows/docker-host-image.yaml
@@ -43,25 +43,25 @@ jobs:
         name: Create SERVICE_TAG variable
         id: service_tag_var
         run: |
-          RAW_TAG=$(echo $(git describe --abbrev=0 --tags --match 'docker-host-*'))
+          RAW_TAG=$(git describe --abbrev=0 --tags --match 'docker-host-*')
           SERVICE_TAG=${RAW_TAG#"docker-host-"}
           echo "using docker-host tag $SERVICE_TAG"
-          echo "SERVICE_TAG=$SERVICE_TAG" >> $GITHUB_ENV
+          echo "SERVICE_TAG=$SERVICE_TAG" >> "$GITHUB_ENV"
       -
         name: Set version for non-tag build
         if: "!startsWith(github.ref, 'refs/tags/docker-host')"
         id: version_non-tag_build
         run: |
-          DOCKER_TAG=${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          DOCKER_TAG="${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)"
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "docker-host version $DOCKER_TAG"
       -
         name: Set version for tag build
         if: "startsWith(github.ref, 'refs/tags/docker-host')"
         id: version_tag_build
         run: |
           DOCKER_TAG=${{ env.SERVICE_TAG }}
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "docker-host version $DOCKER_TAG"
       -
         name: Docker meta

diff --git a/.github/workflows/drush-alias-image.yaml b/.github/workflows/drush-alias-image.yaml
@@ -43,25 +43,25 @@ jobs:
         name: Create SERVICE_TAG variable
         id: service_tag_var
         run: |
-          RAW_TAG=$(echo $(git describe --abbrev=0 --tags --match 'drush-alias-*'))
+          RAW_TAG=$(git describe --abbrev=0 --tags --match 'drush-alias-*')
           SERVICE_TAG=${RAW_TAG#"drush-alias-"}
           echo "using drush-alias tag $SERVICE_TAG"
-          echo "SERVICE_TAG=$SERVICE_TAG" >> $GITHUB_ENV
+          echo "SERVICE_TAG=$SERVICE_TAG" >> "$GITHUB_ENV"
       -
         name: Set version for non-tag build
         if: "!startsWith(github.ref, 'refs/tags/drush-alias')"
         id: version_non-tag_build
         run: |
-          DOCKER_TAG=${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          DOCKER_TAG="${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)"
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "drush-alias version $DOCKER_TAG"
       -
         name: Set version for tag build
         if: "startsWith(github.ref, 'refs/tags/drush-alias')"
         id: version_tag_build
         run: |
           DOCKER_TAG=${{ env.SERVICE_TAG }}
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "drush-alias version $DOCKER_TAG"
       -
         name: Docker meta

diff --git a/.github/workflows/insights-scanner-image.yaml b/.github/workflows/insights-scanner-image.yaml
@@ -43,25 +43,25 @@ jobs:
         name: Create SERVICE_TAG variable
         id: service_tag_var
         run: |
-          RAW_TAG=$(echo $(git describe --abbrev=0 --tags --match 'insights-scanner-*'))
+          RAW_TAG=$(git describe --abbrev=0 --tags --match 'insights-scanner-*')
           SERVICE_TAG=${RAW_TAG#"insights-scanner-"}
           echo "using insights-scanner tag $SERVICE_TAG"
-          echo "SERVICE_TAG=$SERVICE_TAG" >> $GITHUB_ENV
+          echo "SERVICE_TAG=$SERVICE_TAG" >> "$GITHUB_ENV"
       -
         name: Set version for non-tag build
         if: "!startsWith(github.ref, 'refs/tags/insights-scanner')"
         id: version_non-tag_build
         run: |
-          DOCKER_TAG=${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          DOCKER_TAG="${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)"
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "insights-scanner version $DOCKER_TAG"
       -
         name: Set version for tag build
         if: "startsWith(github.ref, 'refs/tags/insights-scanner')"
         id: version_tag_build
         run: |
           DOCKER_TAG=${{ env.SERVICE_TAG }}
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "insights-scanner version $DOCKER_TAG"
       -
         name: Docker meta

diff --git a/.github/workflows/logs-concentrator-image.yaml b/.github/workflows/logs-concentrator-image.yaml
@@ -43,25 +43,25 @@ jobs:
         name: Create SERVICE_TAG variable
         id: service_tag_var
         run: |
-          RAW_TAG=$(echo $(git describe --abbrev=0 --tags --match 'logs-concentrator-*'))
+          RAW_TAG=$(git describe --abbrev=0 --tags --match 'logs-concentrator-*')
           SERVICE_TAG=${RAW_TAG#"logs-concentrator-"}
           echo "using logs-concentrator tag $SERVICE_TAG"
-          echo "SERVICE_TAG=$SERVICE_TAG" >> $GITHUB_ENV
+          echo "SERVICE_TAG=$SERVICE_TAG" >> "$GITHUB_ENV"
       -
         name: Set version for non-tag build
         if: "!startsWith(github.ref, 'refs/tags/logs-concentrator')"
         id: version_non-tag_build
         run: |
-          DOCKER_TAG=${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          DOCKER_TAG="${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)"
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "logs-concentrator version $DOCKER_TAG"
       -
         name: Set version for tag build
         if: "startsWith(github.ref, 'refs/tags/logs-concentrator')"
         id: version_tag_build
         run: |
           DOCKER_TAG=${{ env.SERVICE_TAG }}
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "logs-concentrator version $DOCKER_TAG"
       -
         name: Docker meta

diff --git a/.github/workflows/logs-dispatcher-image.yaml b/.github/workflows/logs-dispatcher-image.yaml
@@ -43,25 +43,25 @@ jobs:
         name: Create SERVICE_TAG variable
         id: service_tag_var
         run: |
-          RAW_TAG=$(echo $(git describe --abbrev=0 --tags --match 'logs-dispatcher-*'))
+          RAW_TAG=$(git describe --abbrev=0 --tags --match 'logs-dispatcher-*')
           SERVICE_TAG=${RAW_TAG#"logs-dispatcher-"}
           echo "using logs-dispatcher tag $SERVICE_TAG"
-          echo "SERVICE_TAG=$SERVICE_TAG" >> $GITHUB_ENV
+          echo "SERVICE_TAG=$SERVICE_TAG" >> "$GITHUB_ENV"
       -
         name: Set version for non-tag build
         if: "!startsWith(github.ref, 'refs/tags/logs-dispatcher')"
         id: version_non-tag_build
         run: |
-          DOCKER_TAG=${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          DOCKER_TAG="${{ env.SERVICE_TAG }}-$(git rev-parse --short=8 HEAD)"
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "logs-dispatcher version $DOCKER_TAG"
       -
         name: Set version for tag build
         if: "startsWith(github.ref, 'refs/tags/logs-dispatcher')"
         id: version_tag_build
         run: |
           DOCKER_TAG=${{ env.SERVICE_TAG }}
-          echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+          echo "DOCKER_TAG=$DOCKER_TAG" >> "$GITHUB_ENV"
           echo "logs-dispatcher version $DOCKER_TAG"
       -
         name: Docker meta