Skip to content

Commit

Permalink
Update deploy pipeline (#12)
Browse files Browse the repository at this point in the history
* Update deploy pipeline

* Remove loki logging driver

---------

Co-authored-by: Kumaran Rajendhiran <[email protected]>
  • Loading branch information
rjambrecic and kumaranvpl authored Jun 20, 2024
1 parent 313123e commit eb68004
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,11 @@ jobs:
needs: [check]
if: github.ref_name == 'main' || github.ref_name == 'dev'
env:
CLIENT_SECRET: ${{ github.ref_name == 'main' && secrets.PROD_CLIENT_SECRET || secrets.STAGING_CLIENT_SECRET }}
DATABASE_URL: ${{ github.ref_name == 'main' && secrets.PROD_DATABASE_URL || secrets.STAGING_DATABASE_URL }}
GITHUB_USERNAME: ${{ github.actor }}
GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
DEVELOPER_TOKEN: ${{ secrets.DEVELOPER_TOKEN }}
# DEVELOPER_TOKEN: ${{ secrets.DEVELOPER_TOKEN }}
DOMAIN: ${{ github.ref_name == 'main' && vars.PROD_DOMAIN || vars.STAGING_DOMAIN }}
SSH_KEY: ${{ github.ref_name == 'main' && secrets.PROD_SSH_KEY || secrets.STAGING_SSH_KEY }}
steps:
Expand Down
12 changes: 0 additions & 12 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
x-logging: &default-logging
driver: loki
options:
loki-url: 'http://localhost:3100/api/prom/push'
loki-pipeline-stages: |
- multiline:
firstline: '^\d{4}-\d{2}-\d{2} \d{1,2}:\d{2}:\d{2}'
max_wait_time: 3s
- regex:
expression: '^(?P<time>\d{4}-\d{2}-\d{2} \d{1,2}:\d{2}:\d{2},d{3}) (?P<message>(?s:.*))$$'
version: "3.4"

name: google-sheets
Expand All @@ -20,7 +9,6 @@ services:
- "8000:8000"
environment:
- DOMAIN=${DOMAIN}
logging: *default-logging
networks:
- google-sheets

Expand Down

0 comments on commit eb68004

Please sign in to comment.