github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
fix(builder-herokuish): fix ARG default value
This commit is contained in:
Jose Diaz-Gonzalez
2024-09-21 20:10:00 -04:00
committed by GitHub
parent 4c03199557 960166b0f7
commit 122f355016
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/builder-herokuish/dockerfiles/builder-pre-release.Dockerfile
View File

@@ -1,5 +1,5 @@
ARG 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/

2
plugins/builder-herokuish/dockerfiles/builder-release.Dockerfile
View File

@@ -1,7 +1,7 @@
ARG 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/
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

2
plugins/builder-herokuish/dockerfiles/copy-source.Dockerfile
View File

@@ -1,7 +1,7 @@
ARG APP_IMAGE
FROM $APP_IMAGE
ARG DOKKU_APP_USER herokuishuser
ARG DOKKU_APP_USER=herokuishuser
ARG TRACE
RUN TRACE=$TRACE USER=$DOKKU_APP_USER /exec true
COPY --chown=$DOKKU_APP_USER . /app

2
plugins/builder-herokuish/dockerfiles/pre-build.Dockerfile
View File

@@ -1,6 +1,6 @@
ARG 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 /app/.env