Merge pull request #375 from edmcouncil/373-organizing-tags-in-docker…

…-compose-files VIEWER_BRANCH and HTML_BRANCH environment variables
edmcouncil · Oct 12, 2023 · 1d54da1 · 1d54da1
2 parents a62a507 + 61f4b4b
commit 1d54da1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -80,6 +80,16 @@ The services provide endpoints at the following URLs:
 - [http://localhost:8080/fibo/ontology](http://localhost:8080/fibo/ontology) :- onto-viewer for [FIBO](https://github.com/edmcouncil/fibo) ontology
 - [http://localhost:8080/fibo/strapi/admin](http://localhost:8080/fibo/strapi/admin) :- [Strapi admin panel](https://docs.strapi.io/user-docs/intro#accessing-the-admin-panel) for for [FIBO](https://github.com/edmcouncil/fibo) ontology (Email: *edmc-strapi@dev.com*, Password: *devDBonly1*)
 
+It is also possible to build (or pull from the registry, if available) Docker images
+with tag names other than the default `develop` - use environment variables:
+- `VIEWER_BRANCH` for `edmcouncil/onto-viewer`, e.g. for [edmcouncil/onto-viewer:build-dev](https://github.com/edmcouncil/onto-viewer/tree/build-dev):
+  ```bash
+  echo VIEWER_BRANCH=build-dev >> .env
+  ```
+- `HTML_BRANCH` for `edmcouncil/html-pages`, e.g. for [edmcouncil/html-pages:build-dev](https://github.com/edmcouncil/html-pages/tree/build-dev):
+  ```bash
+  echo HTML_BRANCH=build-dev >> .env
+  ```
 
 ### ... with an ontology of your choice
 

diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
@@ -1,6 +1,6 @@
 services:
   dev-strapi:
-    image: edmcouncil/dev-strapi:${HTML_BRANCH:-latest}
+    image: edmcouncil/dev-strapi:${HTML_BRANCH:-develop}
     build:
       context: https://github.com/edmcouncil/html-pages.git#${HTML_BRANCH:-develop}:general/strapi
       args:
@@ -9,7 +9,7 @@ services:
     volumes:
       - spec_root:/opt/html-pages
   dev-pages:
-    image: edmcouncil/dev-pages:${HTML_BRANCH:-latest}
+    image: edmcouncil/dev-pages:${HTML_BRANCH:-develop}
     build:
       context: https://github.com/edmcouncil/html-pages.git#${HTML_BRANCH:-develop}:general
       args:
@@ -22,7 +22,7 @@ services:
     depends_on:
       - dev-strapi
   dev-viewer:
-    image: edmcouncil/onto-viewer:${TAG:-latest}
+    image: edmcouncil/onto-viewer:${VIEWER_BRANCH:-develop}
     build:
       context: .
     environment:
@@ -31,7 +31,7 @@ services:
       - ./onto-viewer-web-app/ontologies:/opt/viewer/ontologies
       - ./onto-viewer-web-app/config:/opt/viewer/config
   spec:
-    image: edmcouncil/spec:${HTML_BRANCH:-latest}
+    image: edmcouncil/spec:${HTML_BRANCH:-develop}
     build:
       context: https://github.com/edmcouncil/html-pages.git#${HTML_BRANCH:-develop}:home
       args:

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   fibo-strapi:
-    image: edmcouncil/fibo-strapi:${HTML_BRANCH:-latest}
+    image: edmcouncil/fibo-strapi:${HTML_BRANCH:-develop}
     build:
       context: https://github.com/edmcouncil/html-pages.git#${HTML_BRANCH:-develop}:general/strapi
       args:
@@ -9,7 +9,7 @@ services:
     volumes:
       - spec_root:/opt/html-pages
   fibo-pages:
-    image: edmcouncil/fibo-pages:${HTML_BRANCH:-latest}
+    image: edmcouncil/fibo-pages:${HTML_BRANCH:-develop}
     build:
       context: https://github.com/edmcouncil/html-pages.git#${HTML_BRANCH:-develop}:general
       args:
@@ -22,14 +22,14 @@ services:
     depends_on:
       - fibo-strapi
   fibo-viewer:
-    image: edmcouncil/onto-viewer:${TAG:-latest}
+    image: edmcouncil/onto-viewer:${VIEWER_BRANCH:-develop}
     build:
       context: .
     environment:
       - ONTPUB_FAMILY=fibo
       - UPDATE_URL=${FIBO_UPDATE_URL:-https://spec.edmcouncil.org/fibo/ontology/etc/onto-viewer-web-app/config/}
   spec:
-    image: edmcouncil/spec:${HTML_BRANCH:-latest}
+    image: edmcouncil/spec:${HTML_BRANCH:-develop}
     build:
       context: https://github.com/edmcouncil/html-pages.git#${HTML_BRANCH:-develop}:home
       args: