Add the missing PGSCHEMA

camptocamp · Jun 26, 2019 · ce9cd25 · ce9cd25
1 parent b6a1175
commit ce9cd25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/ci/create-new-project b/ci/create-new-project
@@ -72,12 +72,4 @@ git add --all
 git commit --quiet --message='Initial commit'
 git clean -fX
 
-# Build
-if [ $BASE_APP == false ]
-then
-    docker build --tag=camptocamp/${PACKAGE}-config --build-arg=PGSCHEMA=main .
-    docker build --tag=camptocamp/${PACKAGE}-geoportal --build-arg=GIT_HASH=$(git rev-parse HEAD) geoportal
-else
-    docker build --tag=camptocamp/${PACKAGE}-config:${TAG} --build-arg=PGSCHEMA=main .
-    docker build --tag=camptocamp/${PACKAGE}-geoportal:${TAG} --build-arg=GIT_HASH=$(git rev-parse HEAD) geoportal
-fi
+./build
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/geoportal/Dockerfile_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/create/geoportal/Dockerfile_tmpl
@@ -35,9 +35,11 @@ RUN pip install --disable-pip-version-check --no-cache-dir --no-deps --editable=
 ARG GIT_HASH
 RUN c2cwsgiutils_genversion.py $GIT_HASH
 
+ARG PGSCHEMA
 ENV LOG_LEVEL=INFO \
     GUNICORN_ACCESS_LOG_LEVEL=INFO \
-    C2CGEOPORTAL_LOG_LEVEL=WARN
+    C2CGEOPORTAL_LOG_LEVEL=WARN \
+    PGSCHEMA=$PGSCHEMA
 
 ENTRYPOINT [ "/usr/bin/eval-templates" ]
 CMD ["c2cwsgiutils_run"]