🔧 Fix Terrascan installation on non x86 (#56)

Signed-off-by: Jacob Woffenden <[email protected]>
ministryofjustice · Apr 9, 2024 · 783180d · 783180d
1 parent 96f10b9
commit 783180d
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 49 deletions.
diff --git a/.github/actions/setup-container-structure-test/action.yml b/.github/actions/setup-container-structure-test/action.yml
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -145,9 +145,9 @@ jobs:
         id: checkout
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
-      - name: Set Up Google Container Structure Test
+      - name: Set Up Container Structure Test
         id: setup_container_structure_test
-        uses: ./.github/actions/setup-container-structure-test
+        uses: ministryofjustice/github-actions/setup-container-structure-test@bdab1cff6d23336b6d5adc662fb57af72f0ae160 # v17.1.0
 
       - name: Set Up QEMU
         id: setup_qemu
@@ -170,6 +170,7 @@ jobs:
         id: container_structure_test
         run: |
           container-structure-test test \
+            --platform ${{ matrix.platform }} \
             --config images/${{ matrix.image }}/test/container-structure-test.yml \
             --image ghcr.io/ministryofjustice/devcontainer-${{ matrix.image }}:${{ github.sha }}
 

diff --git a/features/src/aws/CHANGELOG.md b/features/src/aws/CHANGELOG.md
@@ -1,4 +1,4 @@
-<!-- markdownlint-disable MD003 -->
+<!-- markdownlint-disable MD003 MD024 -->
 # Changelog
 
 All notable changes to this project will be documented in this file.
@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.3] - 2024-04-08
+
+### Changed
+
+- Switch to `uname --machine`
+
 ## [0.0.2] - 2024-01-31
 
 ### Changed

diff --git a/features/src/aws/devcontainer-feature.json b/features/src/aws/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "aws",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "name": "AWS",
   "description": "Installs the AWS CLI and AWS SSO CLI",
   "options": {

diff --git a/features/src/aws/install-aws-cli.sh b/features/src/aws/install-aws-cli.sh
@@ -11,9 +11,9 @@ get_system_architecture
 VERSION="${AWSCLIVERSION:-"latest"}"
 
 if [[ "${VERSION}" == "latest" ]]; then
-  ARTEFACT="awscli-exe-linux-$(uname -m).zip"
+  ARTEFACT="awscli-exe-linux-$(uname --machine).zip"
 else
-  ARTEFACT="awscli-exe-linux-$(uname -m)-${VERSION}.zip"
+  ARTEFACT="awscli-exe-linux-$(uname --machine)-${VERSION}.zip"
 fi
 
 curl --fail-with-body --location "https://awscli.amazonaws.com/${ARTEFACT}" \

diff --git a/features/src/static-analysis/CHANGELOG.md b/features/src/static-analysis/CHANGELOG.md
@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.3] - 2024-04-08
+
+### Changed
+
+- Fix architecture for non x86
+
 ## [0.0.2] - 2024-04-05
 
 ## Added

diff --git a/features/src/static-analysis/devcontainer-feature.json b/features/src/static-analysis/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "static-analysis",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "name": "Static Analysis",
   "description": "Installs Checkov, Terrascan and Trivy",
   "options": {

diff --git a/features/src/static-analysis/install-terrascan-cli.sh b/features/src/static-analysis/install-terrascan-cli.sh
@@ -20,8 +20,11 @@ else
   VERSION_STRIP_V="${VERSION#v}"
 fi
 
-ARCHITECTURE=$(uname --machine)
-export ARCHITECTURE
+if [[ "${ARCHITECTURE}" == "amd64" ]]; then
+  ARCHITECTURE="x86_64"
+else
+  ARCHITECTURE="arm64"
+fi
 
 curl --fail-with-body --location "https://github.com/${GITHUB_REPOSITORY}/releases/download/${VERSION}/terrascan_${VERSION_STRIP_V}_Linux_${ARCHITECTURE}.tar.gz" \
   --output "terrascan_${VERSION_STRIP_V}_Linux_${ARCHITECTURE}.tar.gz"

diff --git a/images/base/CHANGELOG.md b/images/base/CHANGELOG.md
@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.6] - 2024-04-08
+
+### Changed
+
+- Switch to `uname --machine`
 
 ## [0.0.5] - 2024-02-13
 

diff --git a/images/base/config.json b/images/base/config.json
@@ -1,4 +1,4 @@
 {
   "name": "base",
-  "version": "0.0.5"
+  "version": "0.0.6"
 }
diff --git a/images/base/src/usr/local/bin/devcontainer-utils b/images/base/src/usr/local/bin/devcontainer-utils
@@ -30,7 +30,7 @@ logger() {
 }
 
 get_system_architecture() {
-  systemArchitecture="$(uname -m)"
+  systemArchitecture="$(uname --machine)"
   export systemArchitecture
 
   case ${systemArchitecture} in