diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rwxr-xr-x | entrypoint.sh | 4 |
3 files changed, 5 insertions, 2 deletions
@@ -1,3 +1,4 @@ instance/ .*.swp git/ +*gz diff --git a/docker-compose.yml b/docker-compose.yml index 492dc69..76d2e59 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: ADMIN_PASSWORD: "1234567890" NEWSPIPE_HOST: "0.0.0.0" NEWSPIPE_PORT: 5004 - NEWSPIPE_BRANCH: "stackrpms-branding" + NEWSPIPE_BRANCH: "reverse-proxy" volumes: # Enable this if you wish to develop the app live, after git cloning to this ./git directory. #- "./git:/newspipe" diff --git a/entrypoint.sh b/entrypoint.sh index 7e67c87..6edba0f 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -19,8 +19,10 @@ case "${1}" in *) cd /newspipe git fetch || : ; - git checkout "${NEWSPIPE_BRANCH}" || { echo "Invalid branch ${NEWSPIPE_BRANCH}" 1>&2 ; exit 1 ; } + test -f instance/config.py && cp -pf instance/config.py instance/config.py1 + git checkout -f "${NEWSPIPE_BRANCH}" || { echo "Invalid branch ${NEWSPIPE_BRANCH}" 1>&2 ; exit 1 ; } git pull || : ; + test -f instance/config.py1 && mv -f instance/config.py1 instance/config.py _host="${1:-${NEWSPIPE_HOST}}" _port="${2:-${NEWSPIPE_PORT}}" set -x |