Skip to content

Commit

Permalink
Merge pull request #81 from eurofurence/issue-77-prepare-ef-2024
Browse files Browse the repository at this point in the history
Issue 77 prepare ef 2024
  • Loading branch information
Jumpy-Squirrel authored Jan 13, 2024
2 parents 9cf35f7 + d2dd2f9 commit 8496cec
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
21 changes: 20 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ on:
push:
branches:
- 'main'
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'

jobs:
call_build-and-push-image:
call_build-and-push-image_latest:
if: startsWith(github.ref, 'refs/heads/')
permissions:
contents: read
packages: write
Expand All @@ -20,3 +23,19 @@ jobs:
registry-user: ${{ github.actor }}
secrets:
registry-pass: ${{ secrets.GITHUB_TOKEN }}

call_build-and-push-image_versioned:
if: startsWith(github.ref, 'refs/tags/v0.1.')
permissions:
contents: read
packages: write
uses: eurofurence/reg-workflows/.github/workflows/docker-build-push.yml@main
with:
image-name: ${{ github.repository }}
image-tags: ${{ github.ref_name }} v0.1
full-repo-url: https://github.com/${{ github.repository }}
branch-or-tag-name: ${{ github.ref_name }}
commit-hash: ${{ github.sha }}
registry-user: ${{ github.actor }}
secrets:
registry-pass: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions internal/web/app/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ func setupLogging(applicationName string, useEcsLogging bool) {
aulogging.RequestIdRetriever = ctxvalues.RequestId
if useEcsLogging {
auzerolog.SetupJsonLogging(applicationName)
zerolog.TimeFieldFormat = "2006-01-02T15:04:05.000Z"
} else {
aulogging.DefaultRequestIdValue = "00000000"
auzerolog.SetupPlaintextLogging()
Expand Down

0 comments on commit 8496cec

Please sign in to comment.