Merge pull request #2043 from c2corg/revert-build

chore: revert to previous build behavior

Author: brunobesson

.dockerignore

@@ -1,7 +1,4 @@
 .build/
 .git/
 .gitignore
-.gitattributes
 .travis.yml
-.github
-

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
         image: postgis/postgis
         env:
           POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: test
+          POSTGRES_PASSWORD: postgres
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -57,19 +57,20 @@ jobs:
       - name: Install python dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install .[dev]
+          python -m pip install -r dev-requirements.txt -r requirements.txt
       - name: Lint
         run: flake8 c2corg_api es_migration
       - name: Configure postgres
         run: |
-          scripts/database/create_test_schema.sh
+          echo "create user \"www-data\" with password 'www-data'" | psql
+          USER=github scripts/create_user_db_test.sh
         env:
-          PGPASSWORD: test
+          PGPASSWORD: postgres
           PGUSER: postgres
           PGHOST: localhost
           PGPORT: 5432
       - name: Create config from templates
-        run: make CONFIG=config/env.test load-env
+        run: make -f config/github-actions template
       - name: Install java 8 for (old) elasticsearch
         uses: actions/setup-java@v4
         with:
@@ -112,13 +113,13 @@ jobs:
           images: ghcr.io/c2corg/v6_api
       - name: Checkout repository
         uses: actions/checkout@v4.1.1
-      - run: git archive --format=tar --output docker/project.tar "$GITHUB_SHA"
+      - run: git archive --format=tar --output project.tar "$GITHUB_SHA"
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Publish the docker image
         uses: docker/build-push-action@v6
         with:
-          context: ./docker
+          context: .
           provenance: false # true creates issues with the old docker compose used in prod
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}

.gitignore

@@ -20,4 +20,3 @@
 config/docker
 .coverage
 coverage.xml
-/config/env.local

Dockerfile

@@ -0,0 +1,66 @@
+FROM docker.io/debian:bullseye-slim
+
+ENV DEBIAN_FRONTEND noninteractive
+
+ENV LC_ALL en_US.UTF-8
+
+RUN set -x \
+    && apt-get update \
+    && apt-get -y upgrade \
+    && apt-get -y --no-install-recommends install locales \
+    && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
+    && locale-gen en_US.UTF-8 \
+    && dpkg-reconfigure locales \
+    && /usr/sbin/update-locale LANG=en_US.UTF-8
+
+COPY project.tar /tmp
+
+WORKDIR /var/www/
+
+RUN tar -xvf /tmp/project.tar && chown -R root:root /var/www
+
+RUN set -x \
+    && apt-get -y --no-install-recommends install \
+    python3 \
+    python3-chardet \
+    python3-colorama \
+    python3-html5lib \
+    python3-pkg-resources \
+    python3-requests \
+    python3-six \
+    python3-urllib3 \
+    libgeos-c1v5 \
+    libpq5 \
+    libffi7 \
+    make \
+    python3-dev \
+    python3-pip \
+    libgeos-dev \
+    libffi-dev \
+    libpq-dev \
+    virtualenv \
+    gcc \
+    git \
+    curl \
+    jq \
+    postgresql-client
+
+RUN set -x \
+    && make -f config/dev install \
+    && py3compile -f .build/venv/ \
+    && rm -fr .cache \
+    && apt-get -y purge \
+    && apt-get -y --purge autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG VERSION
+ENV version=$VERSION \
+    PATH=/var/www/.build/venv/bin/:$PATH
+
+COPY /docker-entrypoint.sh /
+COPY /docker-entrypoint.d/* /docker-entrypoint.d/
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+EXPOSE 8080
+CMD ["gunicorn", "--paste", "production.ini", "-u", "www-data", "-g", "www-data", "-b", ":8080"]

HOWTO-DEV.md

@@ -1,3 +1,2 @@
 include *.txt *.ini *.cfg *.md
 recursive-include c2corg_api *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml
-graft c2corg_api/emails/