Merge pull request #79 from open-contracting/infra/update_translatre_…

…upload ci: Update ci for translate upload and deploy compose
open-contracting · Apr 13, 2021 · 298f652 · 298f652
2 parents fe66d5d + afb6f2f
commit 298f652
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -62,7 +62,7 @@ jobs:
       - name: Install gettext
         run: sudo apt-get install gettext
       - name: Create traslate files
-        run: ./manage.py makemessages -l es
+        run: ./manage.py makemessages --all --keep-pot
       - name: "Upload translate files to transifex"
         with:
             TX_TOKEN: ${{ secrets.TX_TOKEN }}
@@ -110,7 +110,7 @@ jobs:
               pip install transifex-client
               cd ./frontend
               export TX_TOKEN=${{ secrets.TX_TOKEN }}
-              tx pull -l es
+              tx pull -a
       - name: "Download translate files from transifex"
         uses: docker://sergioisidoro/github-transifex-action:v0.2.0
         with:
@@ -174,6 +174,8 @@ jobs:
               echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
               echo "SENTRY_ENVIRONMENT=${{ secrets.SENTRY_ENVIRONMENT }}" >> .env
               echo "DOMAIN=${{ secrets.DOMAIN }}" >> .env
+              echo "API_DOMAIN=${{ secrets.API_DOMAIN }}" >> .env
+              echo "ACME_EMAIL=${{ secrets.ACME_EMAIL }}" >> .env
       - name: Copy .env
         uses: garygrossgarten/github-action-scp@release
         with:

diff --git a/docker-compose.deploy.yaml b/docker-compose.deploy.yaml
@@ -36,8 +36,7 @@ services:
       - '--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.email=${ACME_EMAIL}'
       - '--certificatesresolvers.acmec.acme.httpchallenge=true'
       - '--certificatesresolvers.acmec.acme.httpchallenge.entrypoint=http'
       - '--certificatesresolvers.acmec.acme.storage=/letsencrypt/acme.json'
@@ -48,14 +47,15 @@ services:
     container_name: app
     labels:
       - 'traefik.enable=true'
-      - 'traefik.http.routers.app.rule=Host(`api.$DOMAIN`)'
+      - '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
+      - traefik
     ports:
       - "8000:8000"
     hostname: app