You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2023/01/13 17:29:48 UTC
[allura] 02/02: [#8488] make new image names work still on docker compose 1.x
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
commit d83ca5900f6e032bce3a2df7d4b88291b384ad91
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Fri Jan 13 12:28:28 2023 -0500
[#8488] make new image names work still on docker compose 1.x
---
docker-compose-prod.yml | 1 +
docker-compose.yml | 1 +
2 files changed, 2 insertions(+)
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 9fd59fc60..9f035d0d7 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -39,6 +39,7 @@ version: "2.1"
services:
web:
build: .
+ image: allura-web # default in Compose 2+, makes work in Compose 1.x
environment: &env
# PATH=/allura-data/virtualenv/bin:$PATH doesn't work; see https://github.com/docker/compose/issues/650
- PATH=/allura-data/virtualenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/docker-compose.yml b/docker-compose.yml
index ea91932ab..d340c4b1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ version: "2.1"
services:
web:
build: .
+ image: allura-web # default in Compose 2+, makes work in Compose 1.x
environment: &env
# PATH=/allura-data/virtualenv/bin:$PATH doesn't work; see https://github.com/docker/compose/issues/650
- PATH=/allura-data/virtualenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin