Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

Commit f1302b0

Browse files
committed
update var name, update readme and instructions
1 parent 289bdc6 commit f1302b0

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
125125

126126
## Versions
127127

128+
* **31.07.20:** - Add support for global env var `DOCKER_COMPOSE_IMAGE_TAG` in the `run.sh` script.
128129
* **06.07.20:** - Publish docker-compose and docker-cli binaries in Github releases.
129130
* **01.07.20:** - Release alpine based images at `alpine` tag.
130131
* **04.06.20:** - Bump docker-cli to 19.03.8, auto-detect python3 version.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ full_custom_readme: |
131131
132132
## Versions
133133
134+
* **31.07.20:** - Add support for global env var `DOCKER_COMPOSE_IMAGE_TAG` in the `run.sh` script.
134135
* **06.07.20:** - Publish docker-compose and docker-cli binaries in Github releases.
135136
* **01.07.20:** - Release alpine based images at `alpine` tag.
136137
* **04.06.20:** - Bump docker-cli to 19.03.8, auto-detect python3 version.

run.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@
1313
# You can add additional volumes (or any docker run options) using
1414
# the $COMPOSE_OPTIONS environment variable.
1515
#
16+
# You can set a specific image tag from Docker Hub, such as "1.26.2-ls9", or "alpine"
17+
# using the $DOCKER_COMPOSE_IMAGE_TAG environment variable (defaults to "latest")
18+
#
1619

1720

1821
set -e
1922

20-
DOCKER_COMPOSE_CONTAINER_VERSION="${DOCKER_COMPOSE_CONTAINER_VERSION-latest}" # can be set to a specific version tag from docker hub, such as "1.25.5", or "alpine"
21-
IMAGE="linuxserver/docker-compose:$DOCKER_COMPOSE_CONTAINER_VERSION"
23+
# set image tag to latest if not globally set
24+
DOCKER_COMPOSE_IMAGE_TAG="${DOCKER_COMPOSE_IMAGE_TAG:-latest}"
25+
IMAGE="linuxserver/docker-compose:$DOCKER_COMPOSE_IMAGE_TAG"
2226

2327
# Setup options for connecting to docker host
2428
if [ -z "$DOCKER_HOST" ]; then

0 commit comments

Comments
 (0)