Merge pull request #7147 from F4-Group/fix-docker-arg

fix(builder-herokuish): fix ARG default value
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2024-09-21 20:10:00 -04:00
commit 122f355016
4 files changed
+4 -4

No files matched your search

@@ -1,5 +1,5 @@
ARG APP_IMAGE ARG APP_IMAGE
FROM $APP_IMAGE FROM $APP_IMAGE
ARG DOKKU_APP_USER herokuishuser ARG DOKKU_APP_USER=herokuishuser
COPY --chown=$DOKKU_APP_USER 00-global-env.sh 01-app-env.sh /app/.profile.d/ COPY --chown=$DOKKU_APP_USER 00-global-env.sh 01-app-env.sh /app/.profile.d/
@@ -1,7 +1,7 @@
ARG APP_IMAGE ARG APP_IMAGE
FROM $APP_IMAGE FROM $APP_IMAGE
ARG DOKKU_APP_USER herokuishuser ARG DOKKU_APP_USER=herokuishuser
COPY --chown=$DOKKU_APP_USER 00-global-env.sh 01-app-env.sh /app/.profile.d/ COPY --chown=$DOKKU_APP_USER 00-global-env.sh 01-app-env.sh /app/.profile.d/
RUN find "/app" \( \! -user "$DOKKU_APP_USER" -o \! -group "$DOKKU_APP_USER" \) -print0 | xargs -0 -r chown "$DOKKU_APP_USER:$DOKKU_APP_USER" RUN find "/app" \( \! -user "$DOKKU_APP_USER" -o \! -group "$DOKKU_APP_USER" \) -print0 | xargs -0 -r chown "$DOKKU_APP_USER:$DOKKU_APP_USER"
USER $DOKKU_APP_USER USER $DOKKU_APP_USER
@@ -1,7 +1,7 @@
ARG APP_IMAGE ARG APP_IMAGE
FROM $APP_IMAGE FROM $APP_IMAGE
ARG DOKKU_APP_USER herokuishuser ARG DOKKU_APP_USER=herokuishuser
ARG TRACE ARG TRACE
RUN TRACE=$TRACE USER=$DOKKU_APP_USER /exec true RUN TRACE=$TRACE USER=$DOKKU_APP_USER /exec true
COPY --chown=$DOKKU_APP_USER . /app COPY --chown=$DOKKU_APP_USER . /app
@@ -1,6 +1,6 @@
ARG APP_IMAGE ARG APP_IMAGE
FROM $APP_IMAGE FROM $APP_IMAGE
ARG DOKKU_APP_USER herokuishuser ARG DOKKU_APP_USER=herokuishuser
COPY --chown=$DOKKU_APP_USER .env.d /tmp/env COPY --chown=$DOKKU_APP_USER .env.d /tmp/env
COPY --chown=$DOKKU_APP_USER .env /app/.env COPY --chown=$DOKKU_APP_USER .env /app/.env