Merge 34206d9 into 92fd1d9

open-contracting · Apr 12, 2021 · 60b8063 · 60b8063
2 parents 92fd1d9 + 34206d9
commit 60b8063
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 4 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -35,11 +35,17 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.7
+      - uses: actions/cache@v2
+        with:
+          path: ${{ env.pythonLocation }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
       - name: Install requirements
         run: pip install -r requirements_dev.txt
       - name: Run pre-commit
         run: |
-            pip install --upgrade pre-commit diff-cover
+            pip install pre-commit diff-cover coveralls
             pre-commit autoupdate
             pre-commit run --all-files
       - name: Run tests
@@ -48,4 +54,7 @@ jobs:
             source .envrc
             pytest  --cov-report xml
             git fetch --all
-            diff-cover ./coverage.xml --compare-branch=origin/main --fail-under=95
+            coveralls --service=github
+            diff-cover ./coverage.xml --compare-branch=origin/main --fail-under=${{ secrets.COVERAGE_PERCENT }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -37,18 +37,28 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.7
+      - uses: actions/cache@v2
+        with:
+          path: ${{ env.pythonLocation }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
       - name: Install requirements
         run: pip install -r requirements_dev.txt
       - name: Run pre-commit
         run: |
-            pip install --upgrade pre-commit
+            pip install --upgrade pre-commit coveralls
             pre-commit autoupdate
             pre-commit run --all-files
       - name: Run tests
         run: |
             sed -i 1d .envrc
             source .envrc
             pytest
+      - name: Upload to coveralls
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: coveralls --service=github
       - name: Install gettext
         run: sudo apt-get install gettext
       - name: Create traslate files
@@ -163,6 +173,7 @@ jobs:
               echo "FRONT_IMAGE=docker.pkg.github.com/${{ github.repository }}/${{ secrets.FRONT_IMAGE_NAME }}:latest" >> .env
               echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
               echo "SENTRY_ENVIRONMENT=${{ secrets.SENTRY_ENVIRONMENT }}" >> .env
+              echo "DOMAIN=${{ secrets.DOMAIN }}" >> .env
       - name: Copy .env
         uses: garygrossgarten/github-action-scp@release
         with:

diff --git a/docker-compose.deploy.yaml b/docker-compose.deploy.yaml
@@ -1,11 +1,58 @@
 version: '3.7'
 
 services:
+  traefik:
+    image: traefik:v2.4
+    container_name: traefik
+    env_file:
+      - .env
+    volumes:
+     #- ./traefik:/etc/traefik
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./:/letsencrypt
+    networks:
+      - main
+    labels:
+      - 'traefik.enable=true'
+      - 'traefik.http.routers.api.rule=Host(`traefik.$DOMAIN`)'
+      - 'traefik.http.routers.api.entrypoints=http,https'
+      - 'traefik.http.routers.api.service=api@internal'
+      - 'traefik.http.routers.api.tls=true'
+      - 'traefik.http.routers.api.tls.certresolver=acmec'
+      - 'traefik.http.routers.api.tls.options=default'
+    ports:
+      - 80:80
+      - 443:443
+    command:
+      - '--api'
+      - '--api.insecure=true'
+      - '--providers.docker=true'
+      - '--providers.docker.exposedByDefault=false'
+      - '--entrypoints.http=true'
+      - '--entrypoints.http.address=:80'
+      - '--entrypoints.http.http.redirections.entrypoint.to=https'
+      - '--entrypoints.http.http.redirections.entrypoint.scheme=https'
+      - '--entrypoints.https=true'
+      - '--entrypoints.https.address=:443'
+      - '--log=true'
+      - '--log.level=INFO'
+      - '--certificatesresolvers.acmec.acme.email=pontostroy@quintagroup.org'
+      - '--certificatesresolvers.acmec.acme.storage=/acme.json'
+      - '--certificatesresolvers.acmec.acme.httpchallenge=true'
+      - '--certificatesresolvers.acmec.acme.httpchallenge.entrypoint=http'
+      - '--certificatesresolvers.acmec.acme.storage=/letsencrypt/acme.json'
   app:
     image: ${IMAGE}
     pull_policy: if_not_present
     command: sh -c "python manage.py collectstatic --noinput && python manage.py migrate && daphne -b 0.0.0.0 -p 8000 spoonbill_web.asgi:application"
     container_name: app
+    labels:
+      - 'traefik.enable=true'
+      - 'traefik.http.routers.app.rule=Host(`api.$DOMAIN`)'
+      - 'traefik.http.routers.app.entrypoints=http,https'
+      - 'traefik.http.routers.app.tls=true'
+      - 'traefik.http.routers.app.tls.certresolver=acmec'
+      - 'traefik.http.routers.app.tls.options=default'
     depends_on:
       - postgres
       - redis
@@ -85,8 +132,15 @@ services:
   front:
     image: ${FRONT_IMAGE}
     container_name: front
+    labels:
+      - 'traefik.enable=true'
+      - 'traefik.http.routers.site.rule=Host(`$DOMAIN`)'
+      - 'traefik.http.routers.site.entrypoints=http,https'
+      - 'traefik.http.routers.site.tls=true'
+      - 'traefik.http.routers.site.tls.certresolver=acmec'
+      - 'traefik.http.routers.site.tls.options=default'
     ports:
-      - "80:80"
+      - "88:88"
     env_file:
       - .env
     depends_on: