From acca60111ecb36c9eac5e7f6669f8181576ed137 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Fri, 23 Feb 2024 13:45:28 +0900 Subject: [PATCH] Fix incorrect command substitutions in Dockerfile This commit removes the backticks in the Dockerfile that are incorrectly interpreted as command substitutions. Signed-off-by: Stephanos Ioannidis --- pkg/docker/Dockerfile | 4 ++-- pkg/docker/Dockerfile_Alpine | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile index d1910adad..90fc1e6d4 100644 --- a/pkg/docker/Dockerfile +++ b/pkg/docker/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ echo '#!/bin/sh' > /usr/local/bin/docker-entrypoint.sh; \ echo 'set -e' >> /usr/local/bin/docker-entrypoint.sh; \ echo "# first arg is '-f' or '--some-option'" >> /usr/local/bin/docker-entrypoint.sh; \ - echo "# or first arg is `something.conf`" >> /usr/local/bin/docker-entrypoint.sh; \ + echo "# or first arg is 'something.conf'" >> /usr/local/bin/docker-entrypoint.sh; \ echo 'if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \ echo ' set -- keydb-server "$@"' >> /usr/local/bin/docker-entrypoint.sh; \ echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \ @@ -101,7 +101,7 @@ RUN set -eux; \ echo 'if [ -n "$KEYDB_PASSWORD" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \ echo ' set -- "$@" --requirepass "${KEYDB_PASSWORD}"' >> /usr/local/bin/docker-entrypoint.sh; \ echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \ - echo "# allow the container to be started with `--user`" >> /usr/local/bin/docker-entrypoint.sh; \ + echo "# allow the container to be started with '--user'" >> /usr/local/bin/docker-entrypoint.sh; \ echo 'if [ "$1" = "keydb-server" -a "$(id -u)" = "0" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \ echo " find . \! -user keydb -exec chown keydb '{}' +" >> /usr/local/bin/docker-entrypoint.sh; \ echo ' exec gosu keydb "$0" "$@"' >> /usr/local/bin/docker-entrypoint.sh; \ diff --git a/pkg/docker/Dockerfile_Alpine b/pkg/docker/Dockerfile_Alpine index 2787eda0b..4e9f87d9c 100644 --- a/pkg/docker/Dockerfile_Alpine +++ b/pkg/docker/Dockerfile_Alpine @@ -64,7 +64,7 @@ RUN set -eux; \ echo '#!/bin/sh' > /usr/local/bin/docker-entrypoint.sh; \ echo 'set -e' >> /usr/local/bin/docker-entrypoint.sh; \ echo "# first arg is '-f' or '--some-option'" >> /usr/local/bin/docker-entrypoint.sh; \ - echo "# or first arg is `something.conf`" >> /usr/local/bin/docker-entrypoint.sh; \ + echo "# or first arg is 'something.conf'" >> /usr/local/bin/docker-entrypoint.sh; \ echo 'if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \ echo ' set -- keydb-server "$@"' >> /usr/local/bin/docker-entrypoint.sh; \ echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \ @@ -72,7 +72,7 @@ RUN set -eux; \ echo 'if [ -n "$KEYDB_PASSWORD" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \ echo ' set -- "$@" --requirepass "${KEYDB_PASSWORD}"' >> /usr/local/bin/docker-entrypoint.sh; \ echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \ - echo "# allow the container to be started with `--user`" >> /usr/local/bin/docker-entrypoint.sh; \ + echo "# allow the container to be started with '--user'" >> /usr/local/bin/docker-entrypoint.sh; \ echo 'if [ "$1" = "keydb-server" -a "$(id -u)" = "0" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \ echo " find . \! -user keydb -exec chown keydb '{}' +" >> /usr/local/bin/docker-entrypoint.sh; \ echo ' exec su-exec keydb "$0" "$@"' >> /usr/local/bin/docker-entrypoint.sh; \