From 9f832cb5279f32756ff585260895c531088d642c Mon Sep 17 00:00:00 2001 From: Xander Luedtke Date: Tue, 3 Jan 2023 22:36:20 -0700 Subject: [PATCH] Adding REPO_BRANCH --- docker/Dockerfile | 2 ++ docker/docker-compose.yml | 1 + docker/entrypoint.sh | 2 +- docker/traefik-complete/docker-compose.yml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 611d98e8..f00d9fed 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,6 +13,8 @@ ENV ITFLOW_PORT 8080 ENV ITFLOW_REPO github.com/itflow-org/itflow +ENV ITFLOW_REPO_BRANCH master + # apache2 log levels: emerg, alert, crit, error, warn, notice, info, debug ENV ITFLOW_LOG_LEVEL warn diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 2c72110c..23feb43a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -37,6 +37,7 @@ services: - ITFLOW_URL=it.$ROOT_DOMAIN - ITFLOW_PORT=8080 - ITFLOW_REPO=github.com/itflow-org/itflow + - ITFLOW_REPO_BRANCH=master - ITFLOW_LOG_LEVEL=info - ITFLOW_DB_HOST=itflow-db - ITFLOW_DB_PASS=$ITFLOW_DB_PASS diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 72098dee..4429c8a4 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -20,7 +20,7 @@ if [[ -f /var/www/html/index.php ]]; then cd /var/www/html git fetch else - git clone https://$ITFLOW_REPO /var/www/html + git clone --branch $ITFLOW_REPO_BRANCH https://$ITFLOW_REPO /var/www/html fi git config --global --add safe.directory /var/www/html diff --git a/docker/traefik-complete/docker-compose.yml b/docker/traefik-complete/docker-compose.yml index 29b95a74..8fb25bbd 100644 --- a/docker/traefik-complete/docker-compose.yml +++ b/docker/traefik-complete/docker-compose.yml @@ -155,6 +155,7 @@ services: - ITFLOW_URL=$ITFLOW_URL - ITFLOW_PORT=8080 - ITFLOW_REPO=github.com/itflow-org/itflow + - ITFLOW_REPO_BRANCH=master - ITFLOW_LOG_LEVEL=info - ITFLOW_DB_HOST=itflow-db - ITFLOW_DB_PASS=$ITFLOW_DB_PASS