Update dependencies and add for dev

- Adject for poetry in production
- Using snok/install-poetry for actions
- Python version down to 3.8
- Fixed lost using poetry run

Author: toomore

.github/workflows/build_image.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           context: .
           file: Dockerfile-base
-          tags: coscupweb-base:22.03.13
+          tags: coscupweb-base:22.05.04
           load: true
       - name: List images
         run: docker images

.github/workflows/docker-compose.yml

@@ -2,12 +2,6 @@ name: DockerCompose
 
 on:
   push:
-    paths:
-      - 'Dockerfile-**'
-      - 'docker-compose.yml'
-      - '.github/workflows/docker-compose.yml'
-    branches:
-      - 'code-style'
   workflow_dispatch:
 
 jobs:

.github/workflows/pytest.yml

@@ -19,11 +19,16 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install PIP
-        run: pip install -r requirements.txt
-      - name: Install pytest and pytest-cov
-        run: pip install pytest pytest-cov
+      - name: Install and configure Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.1.13
+          virtualenvs-create: true
+          virtualenvs-in-project: false
+          installer-parallel: true
+      - name: Install dependencies
+        run: poetry install
       - name: Create setting.py
         run: mv setting_sample.py setting.py
       - name: Run Testing
-        run: PYTHONPATH=./ pytest -vv --cov-report=term-missing --cov ./
+        run: PYTHONPATH=./ poetry run pytest -vv --cov-report=term-missing --cov ./

Dockerfile-app

@@ -1,4 +1,4 @@
-FROM coscupweb-base:22.03.13
+FROM coscupweb-base:22.05.04
 
 ADD ./client_secret.json ./client_secret.json
 ADD ./privacy.md ./privacy.md

Dockerfile-app-dev

@@ -1,4 +1,4 @@
-FROM coscupweb-base:22.03.13
+FROM coscupweb-base:22.05.04
 
 #ADD ./client_secret.json ./client_secret.json
 ADD ./privacy.md ./privacy.md

Dockerfile-base

@@ -1,7 +1,8 @@
-FROM alpine:3.15.0
+FROM alpine:3.15.2
 
 WORKDIR /app
-ADD ./requirements.txt ./requirements.txt
+ADD pyproject.toml poetry.lock ./
+ENV PATH="/root/.poetry/bin:${PATH}"
 RUN \
   apk update && apk upgrade                                   && \
   apk add --no-cache python3 ca-certificates libmemcached-dev && \
@@ -10,14 +11,10 @@ RUN \
   wget https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2 && \
   tar xvjf jemalloc-5.2.1.tar.bz2 && cd jemalloc-5.2.1 && ./configure && make && make install && \
   cd ../ && rm -rf ./jemalloc* && \
-  curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py     && \
-  python3 get-pip.py                                          && \
-  rm get-pip.py                                               && \
-  pip install poetry
+  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3 - && \
+  find $HOME/.poetry/lib/poetry/_vendor/ -mindepth 1 -maxdepth 1 -not -name py3.9 -type d  | xargs rm -rf && \
+  poetry install
 
-# Install PIP dependencies
-ADD pyproject.toml poetry.lock /app/
-RUN poetry install
 
 # Cleanup
 RUN apk del .build-deps && \

build-base.sh

@@ -1 +1 @@
-docker build --no-cache=true -t coscupweb-base:22.03.13 -f ./Dockerfile-base ./
+docker build --no-cache=true -t coscupweb-base:22.05.04 -f ./Dockerfile-base ./

docker-compose.yml

@@ -19,7 +19,7 @@ services:
       - backend
 
   webappbase:
-    image: "coscupweb-base:22.03.13"
+    image: "coscupweb-base:22.05.04"
     build:
       context: .
       dockerfile: ./Dockerfile-base
@@ -45,7 +45,7 @@ services:
       replicas: 4
     networks:
       - backend
-    command: ["uwsgi", "./uwsgi.ini"]
+    command: ["poetry", "run", "uwsgi", "./uwsgi.ini"]
 
   celery_worker:
     image: "volunteer-app:prod"
@@ -66,7 +66,7 @@ services:
       - C_FORCE_ROOT=true
     networks:
       - backend
-    command: ["celery", "-A", "celery_task.celery_main", "worker", "-B", "-l", "info", "-O", "fair", "-c", "4", "--logfile", "./log/log.log"]
+    command: ["poetry", "run", "celery", "-A", "celery_task.celery_main", "worker", "-B", "-l", "info", "-O", "fair", "-c", "4", "--logfile", "./log/log.log"]
 
   memcached-prod:
     image: "memcached:1.6.6-alpine"