fix-server

custom/Dockerfile

@@ -33,8 +33,8 @@ RUN cd /tmp && PIP_NO_BINARY=fiona,rasterio,shapely PROJ_DIR=/usr/local/ pipenv
 RUN apt-get remove --autoremove --assume-yes gcc
 
 WORKDIR /app
-COPY . /app
-RUN python3 -m pip install --disable-pip-version-check --no-cache-dir --editable=/app/ && \
+COPY . ./
+RUN python3 -m pip install --disable-pip-version-check --no-cache-dir --editable=. && \
     python3 -m compileall -q /app/custom
 # hadolint ignore=DL3059
 RUN mkdir -p /etc/gunicorn/ && \

custom/custom/models/__init__.py

@@ -1,11 +1,7 @@
-import os
-
 import zope.sqlalchemy
-from sqlalchemy import Column, Integer, String, engine_from_config
+from sqlalchemy import engine_from_config
 from sqlalchemy.orm import configure_mappers, sessionmaker
 
-from .meta import Base
-
 # Run ``configure_mappers`` after defining all of the models to ensure
 # all relationships can be setup.
 configure_mappers()
@@ -120,13 +116,3 @@ def dbsession(request):
         return dbsession
 
     config.add_request_method(dbsession, reify=True)
-
-
-class Feedback(Base):
-    __tablename__ = "feedback"
-    __table_args__ = {"schema": os.environ.get("PGSCHEMA", "main")}
-    id_feedback = Column(Integer, primary_key=True)
-    ua = Column(String(250))
-    permalink = Column(String(5000))
-    text = Column(String(1000))
-    email = Column(String(100))

custom/custom/models/feedback.py

@@ -0,0 +1,14 @@
+import os
+
+from sqlalchemy import Column, Integer, String
+
+from .meta import Base
+
+class Feedback(Base):
+    __tablename__ = "feedback"
+    __table_args__ = {"schema": os.environ.get("PGSCHEMA", "main")}
+    id_feedback = Column(Integer, primary_key=True)
+    ua = Column(String(250))
+    permalink = Column(String(5000))
+    text = Column(String(1000))
+    email = Column(String(100))

docker-compose-lib.yaml

@@ -193,13 +193,6 @@ services:
 
   geoportal:
     image: ${DOCKER_BASE}-geoportal:${DOCKER_TAG}
-    build:
-      context: geoportal
-      args:
-        GIT_HASH: ${GIT_HASH}
-        PGSCHEMA: ${PGSCHEMA}
-        GEOMAPFISH_VERSION: ${GEOMAPFISH_VERSION}
-        GEOMAPFISH_MAIN_VERSION: ${GEOMAPFISH_MAIN_VERSION}
     user: www-data
     restart: unless-stopped
     environment: