From 6e752c87207d922c7995fc4769eb60d6758f747b Mon Sep 17 00:00:00 2001 From: Mike Delago <32778141+michaeldelago@users.noreply.github.com> Date: Tue, 14 Nov 2023 11:36:27 -0500 Subject: [PATCH] fix(Docker): Tweak entrypoint permissions (#17698) * fix(Docker): Fix entrypoint permissions * use entrypoint.sh as an argument to bash * attempt to use more specified filepaths --- apps/docker/Dockerfile | 7 ++++--- apps/docker/entrypoint.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/docker/Dockerfile b/apps/docker/Dockerfile index d500efe43..0c758f9a3 100644 --- a/apps/docker/Dockerfile +++ b/apps/docker/Dockerfile @@ -132,12 +132,13 @@ RUN groupadd --gid "$GROUP_ID" "$DOCKER_USER" && \ passwd -d "$DOCKER_USER" && \ chown -R "$DOCKER_USER:$DOCKER_USER" /azerothcore -COPY apps/docker/entrypoint.sh /entrypoint.sh -RUN chmod -v +x /entrypoint.sh +COPY --chown=$USER_ID:GROUP_ID \ + --chmod=755 \ + apps/docker/entrypoint.sh /azerothcore/entrypoint.sh USER $DOCKER_USER -ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["/usr/bin/env", "bash", "/azerothcore/entrypoint.sh"] ############### # Auth Server # diff --git a/apps/docker/entrypoint.sh b/apps/docker/entrypoint.sh index 62504fc0d..5cd7fc28d 100644 --- a/apps/docker/entrypoint.sh +++ b/apps/docker/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail # Copy all default config files to env/dist/etc if they don't already exist