lint: fix hadolint issues

rewardenv · Nov 23, 2024 · f503283 · f503283
1 parent 053818c
commit f503283
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/lint-dockerfiles.yml b/.github/workflows/lint-dockerfiles.yml
@@ -7,7 +7,7 @@ on:
       - images/**
     branches:
       - main
-  pull_request: null
+  pull_request:
 permissions:
   contents: read
 jobs:

diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
@@ -2,10 +2,10 @@
 ---
 name: "Spelling"
 on:
-  pull_request: null
   push:
     branches:
       - "main"
+  pull_request:
 permissions:
   contents: "read"
 concurrency:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,10 +10,8 @@ on:
       - go.mod
       - go.sum
   pull_request:
-
 permissions:
   contents: read
-
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/images/php-fpm-rootless/base/tpl.Dockerfile b/images/php-fpm-rootless/base/tpl.Dockerfile
@@ -23,6 +23,7 @@ COPY rootfs/. /
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+# hadolint ignore=SC2016
 RUN <<-EOF
     set -eux
     apt-get update

diff --git a/images/php-fpm-rootless/blackfire/tpl.Dockerfile b/images/php-fpm-rootless/blackfire/tpl.Dockerfile
@@ -35,7 +35,7 @@ USER www-data
 RUN <<-EOF
     set -eux
     mkdir -p /tmp/blackfire "${HOME}/.local/bin"
-    curl -fsSL https://blackfire.io/api/v1/releases/client/linux_static/amd64 | tar zxp -C /tmp/blackfire
+    wget -q -O - https://blackfire.io/api/v1/releases/client/linux_static/amd64 | tar zxp -C /tmp/blackfire
     mv /tmp/blackfire/blackfire "${HOME}/.local/bin/blackfire"
     chmod +x "${HOME}/.local/bin/blackfire"
     rm -rf /tmp/blackfire

diff --git a/images/sshd/tpl.Dockerfile b/images/sshd/tpl.Dockerfile
@@ -3,6 +3,8 @@ FROM alpine:{{ getenv "IMAGE_TAG" "3.15" }}
 
 COPY ./entry.sh /entry.sh
 
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
+
 RUN <<-EOF
     set -eux
     apk add --no-cache \
@@ -13,11 +15,11 @@ RUN <<-EOF
       rssh \
       rsync \
       shadow
-    deluser $(getent passwd 33 | cut -d: -f1)
-    delgroup $(getent group 33 | cut -d: -f1) 2>/dev/null || true
+    deluser "$(getent passwd 33 | cut -d: -f1)"
+    delgroup "$(getent group 33 | cut -d: -f1)" 2>/dev/null || true
     mkdir -p ~root/.ssh /etc/authorized_keys && chmod 700 ~root/.ssh/
     augtool 'set /files/etc/ssh/sshd_config/AuthorizedKeysFile ".ssh/authorized_keys /etc/authorized_keys/%u"'
-    echo -e "Port 22\n" >> /etc/ssh/sshd_config
+    printf "Port 22\n" >> /etc/ssh/sshd_config
     cp -a /etc/ssh /etc/ssh.cache
     chmod +x /entry.sh
 EOF