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

Commit 16027ef

Browse files
committed
Remove DOCKER_COMPOSE_IMAGE_TAG requirement
1 parent 4e847ee commit 16027ef

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

readme-vars.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,23 +81,15 @@ full_custom_readme: |
8181
8282
### Recommended method
8383
84-
We provide a very convenient script that allows the docker-compose container to run as if it was installed natively.
85-
86-
First run the following commands to setup the script:
84+
We provide a very convenient script that allows the docker-compose container to run as if it was installed natively:
8785
8886
```
8987
export DOCKER_COMPOSE_IMAGE_TAG=ghcr.io/linuxserver/docker-compose:latest
9088
sudo curl -L --fail https://raw.githubusercontent.com/linuxserver/docker-docker-compose/master/run.sh -o /usr/local/bin/docker-compose
9189
sudo chmod +x /usr/local/bin/docker-compose
9290
```
9391
94-
After running these commands you can issue commands such as `docker-compose up -d` and the docker-compose container will do its job behind the scenes.
95-
96-
The `DOCKER_COMPOSE_IMAGE_TAG` variable needs to be made persistent in order to continue using our image after logging out or rebooting. To do this you will need to edit `/etc/environment` and add or set the following variable:
97-
98-
```
99-
DOCKER_COMPOSE_IMAGE_TAG=ghcr.io/linuxserver/docker-compose:latest
100-
```
92+
Running these two commands on your docker host once will let you issue commands such as `docker-compose up -d` and the docker-compose container will do its job behind the scenes.
10193
10294
### Binaries
10395
@@ -142,7 +134,7 @@ full_custom_readme: |
142134
143135
## Versions
144136
145-
* **03.11.20:** - Update run.sh with formatting changes. IMPORTANT!! This now requires a `DOCKER_COMPOSE_IMAGE_TAG` variable to be set in order to use our image! See https://github.com/linuxserver/docker-docker-compose#recommended-method for instructions!
137+
* **03.11.20:** - Update run.sh with formatting changes.
146138
* **04.10.20:** - Update run.sh with changes from upstream.
147139
* **31.08.20:** - Update tox and virtualenv.
148140
* **31.07.20:** - Add support for global env var `DOCKER_COMPOSE_IMAGE_TAG` in the `run.sh` script.

run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ if docker info --format '{{json .SecurityOptions}}' 2> /dev/null | grep -q 'name
6868
fi
6969

7070
# shellcheck disable=SC2086
71-
exec docker run --rm ${DOCKER_RUN_OPTIONS} ${DOCKER_ADDR} ${COMPOSE_OPTIONS} ${VOLUMES} -w "${PWD}" "${DOCKER_COMPOSE_IMAGE_TAG:-docker/compose:1.27.4}" "$@"
71+
exec docker run --rm ${DOCKER_RUN_OPTIONS} ${DOCKER_ADDR} ${COMPOSE_OPTIONS} ${VOLUMES} -w "${PWD}" "${DOCKER_COMPOSE_IMAGE_TAG:-ghcr.io/linuxserver/docker-compose:latest}" "$@"

0 commit comments

Comments
 (0)