diff --git a/.github/workflows/build-ralphex-fe.yml b/.github/workflows/build-ralphex-fe.yml index bc2967d..62bedc8 100644 --- a/.github/workflows/build-ralphex-fe.yml +++ b/.github/workflows/build-ralphex-fe.yml @@ -6,7 +6,7 @@ on: - master paths: - 'ralphex-fe/Dockerfile' - - 'ralphex-fe/files/**' + - 'ralphex-fe/*.sh' workflow_dispatch: permissions: diff --git a/ralphex-fe/Dockerfile b/ralphex-fe/Dockerfile index e089f5f..83d1e77 100644 --- a/ralphex-fe/Dockerfile +++ b/ralphex-fe/Dockerfile @@ -127,8 +127,8 @@ ENV PATH="${PATH}:${GOROOT}/bin:${GOPATH}/bin" # Adapted from: https://github.com/umputun/baseimage/blob/master/base.alpine/files/init.sh # /srv/init.sh — credential copier run before main command # Source: https://github.com/umputun/ralphex/blob/master/scripts/internal/init-docker.sh -COPY files/init.sh /init.sh -COPY files/init-docker.sh /srv/init.sh +COPY init.sh /init.sh +COPY init-docker.sh /srv/init.sh RUN chmod +x /init.sh /srv/init.sh WORKDIR /workspace diff --git a/ralphex-fe/files/init-docker.sh b/ralphex-fe/init-docker.sh similarity index 100% rename from ralphex-fe/files/init-docker.sh rename to ralphex-fe/init-docker.sh diff --git a/ralphex-fe/files/init.sh b/ralphex-fe/init.sh similarity index 93% rename from ralphex-fe/files/init.sh rename to ralphex-fe/init.sh index f49b413..77ab7d8 100755 --- a/ralphex-fe/files/init.sh +++ b/ralphex-fe/init.sh @@ -44,6 +44,9 @@ if [ "${uid}" -eq 0 ]; then fi chown -R app:app /srv + # Always fix /home/app itself (non-recursive) so the app user can create + # subdirectories even when APP_UID is remapped and SKIP_HOME_CHOWN=1. + chown app:app /home/app if [ "${SKIP_HOME_CHOWN}" != "1" ]; then chown -R app:app /home/app fi