Use demo image name

camptocamp · Jan 14, 2020 · c58cf95 · c58cf95
1 parent f44fdf7
commit c58cf95
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
     docker:
       - image: circleci/python:3
     environment: &environment
-      - PROJECT=geomapfish
+      - PROJECT=demo
       - OPENSHIFT_PROJECT=gs-gmf-demo
       - HELM_RELEASE_NAMES=prod-2-5
       - DOCKER_USERNAME=dockerhubc2c

diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ addons:
 
 env:
   global:
-    - PROJECT=geomapfish
+    - PROJECT=demo
     - OPENSHIFT_PROJECT=gs-gmf-demo
     - HELM_RELEASE_NAMES=prod-2-5
     - DOCKER_USERNAME=dockerhubc2c

diff --git a/build b/build
@@ -52,22 +52,23 @@ for env_file in args.env_files:
                     # Ignore lines that don't have a '='
                     pass
 
+base = env['DOCKER_BASE'] if 'DOCKER_BASE' in env else "camptocamp/geomapfish-config"
 tag = ":" + env['DOCKER_TAG'] if 'DOCKER_TAG' in env else ""
 
 if auto or args.config:
     print(
-        " ".join(["docker", "build", "--tag=camptocamp/geomapfish-config" + tag, "--build-arg=PGSCHEMA=" + args.pgschema, "."])
+        " ".join(["docker", "build", "--tag=" + base + tag, "--build-arg=PGSCHEMA=" + args.pgschema, "."])
     )
     subprocess.check_call(
-        ["docker", "build", "--tag=camptocamp/geomapfish-config" + tag, "--build-arg=PGSCHEMA=" + args.pgschema, "."]
+        ["docker", "build", "--tag=" + base + tag, "--build-arg=PGSCHEMA=" + args.pgschema, "."]
     )
 if auto or args.geoportal:
     git_hash = subprocess.check_output(["git", "rev-parse", "HEAD"]).strip().decode()
     subprocess.check_call(
         [
             "docker",
             "build",
-            "--tag=camptocamp/geomapfish-geoportal" + tag,
+            "--tag=" + base + tag,
             "--build-arg=PGSCHEMA=" + args.pgschema,
             "--build-arg=GIT_HASH=" + git_hash,
             "geoportal",