Merge branch 'main' into dependabot/docker/aws-cli/amazon/aws-cli-2.1…

…5.39

.github/workflows/dockerimage.yml

@@ -31,9 +31,6 @@ jobs:
             type=schedule
             type=ref,event=branch
             type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
             type=sha
       - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         if: github.ref == 'refs/heads/main'

.github/workflows/dockerrelease.yml

@@ -6,6 +6,8 @@ on:
     types: [published]
   workflow_dispatch:
 
+permissions: {}
+
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/linter.yml

@@ -62,5 +62,6 @@ jobs:
         uses: super-linter/super-linter@9d8128f17796a16326ceed5a607d5639a47feb82 # v6.4.0
         env:
           VALIDATE_ALL_CODEBASE: true
+          LINTER_RULES_PATH: .
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

aws-cli/Dockerfile

@@ -1,5 +1,13 @@
 FROM amazon/aws-cli:2.15.39@sha256:0e58eddb945a5496c5e4370b37676b06f7ac54d40d5fb98c93df2ea749f0ad11
 
+HEALTHCHECK NONE
+
+ENTRYPOINT []
+
+ARG USER_NAME=default
+ARG USER_HOME=/home/default
+ARG USER_ID=1000
+
 # hadolint ignore=DL3033
 RUN yum update -y \
     && yum install -y bash curl git jq make python3-pip tar unzip xmlstarlet zip \
@@ -9,8 +17,15 @@ RUN yum update -y \
 # hadolint ignore=DL3013
 RUN pip3 install --no-cache-dir cfn-policy-validator
 
-WORKDIR /opt
+RUN adduser \
+  --home-dir "${USER_HOME}" \
+  --uid "${USER_ID}" \
+  "${USER_NAME}"
 
-ENTRYPOINT []
+ENV HOME "${USER_HOME}"
+
+USER "${USER_NAME}"
+
+WORKDIR /opt
 
 CMD ["/bin/bash"]

aws-cli/docker-compose.test.yml

@@ -6,4 +6,4 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    command: aws --version
+    command: "sh -c '[ $(id -u) -ne 0 ] && aws --version'"