Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docker-compose.yml

Author: yeezy-na-izi

.github/workflows/release-package.yml

@@ -37,7 +37,7 @@ jobs:
             
             echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
             
-            docker run -d --env-file .env -p 8000:8000 ghcr.io/procollab-github/api:latest
+            docker-compose up -d 
   PushImage:
     runs-on: ubuntu-latest
     steps:

Dockerfile

@@ -3,12 +3,12 @@ FROM python:3.9
 RUN apt update --no-install-recommends -y
 
 ENV PYTHONFAULTHANDLER=1 \
-  PYTHONUNBUFFERED=1 \
-  PYTHONHASHSEED=random \
-  PIP_NO_CACHE_DIR=off \
-  PIP_DISABLE_PIP_VERSION_CHECK=on \
-  PIP_DEFAULT_TIMEOUT=100 \
-  POETRY_VERSION=1.2.2
+    PYTHONUNBUFFERED=1 \
+    PYTHONHASHSEED=random \
+    PIP_NO_CACHE_DIR=off \
+    PIP_DISABLE_PIP_VERSION_CHECK=on \
+    PIP_DEFAULT_TIMEOUT=100 \
+    POETRY_VERSION=1.2.2
 
 RUN pip install "poetry==$POETRY_VERSION"
 
@@ -19,7 +19,7 @@ WORKDIR /procollab
 COPY poetry.lock pyproject.toml /procollab/
 
 RUN poetry config virtualenvs.create false \
-  && poetry install  --no-root
+    && poetry install  --no-root
 
 EXPOSE 8000
 
@@ -28,3 +28,5 @@ RUN mkdir /procollab/static
 COPY . /procollab/
 
 CMD ["bash", "startup.sh"]
+
+VOLUME ["/procollab/static/"]

docker-compose.yml

@@ -5,12 +5,11 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
-    # command: gunicorn procollab.wsgi:application --bind
     ports:
       - "8000:8000"
-    image: web:latest
+    image: ghcr.io/procollab-github/api:latest
     restart: always
     env_file:
       - .env
     environment:
-      HOST: 0.0.0.0
+      HOST: 0.0.0.0

procollab/settings.py

@@ -179,7 +179,6 @@
 
 STATIC_URL = "/static/"
 STATIC_ROOT = os.path.join(BASE_DIR, "static/")
-
 STATICFILES_FINDERS = [
     "django.contrib.staticfiles.finders.FileSystemFinder",
     "django.contrib.staticfiles.finders.AppDirectoriesFinder",
@@ -218,6 +217,8 @@
     "SLIDING_TOKEN_REFRESH_LIFETIME": timedelta(days=1),
 }
 
+SESSION_COOKIE_SECURE = True
+
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 EMAIL_USE_TLS = True
 EMAIL_HOST = config("EMAIL_HOST", default="smtp.gmail.com", cast=str)