Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the missing PGSCHEMA #5090

Merged
merged 1 commit into from
Jun 26, 2019
Merged

Add the missing PGSCHEMA #5090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ jobs:
--tag=camptocamp/geomapfish-qgisserver:gmf${MAJOR_VERSION}-qgis3.6 \
docker/qgisserver
ci/create-new-project ${HOME}/workspace geomapfish
docker tag camptocamp/geomapfish-geoportal:${MAJOR_VERSION} camptocamp/geomapfish-geoportal
ci/publish

publish:
Expand Down
10 changes: 1 addition & 9 deletions ci/create-new-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion geoportal/c2cgeoportal_geoportal/scaffolds/create/geoportal/Dockerfile_tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]