Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
dweinholz committed Mar 28, 2023
2 parents 8eee14c + ef0aac2 commit 44268da
Show file tree
Hide file tree
Showing 6 changed files with 1,197 additions and 1,141 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
uses: rokroskar/[email protected]
env:
GITHUB_TOKEN: "${{ secrets.GITHUBSECRET2 }}"
- uses: actions/checkout@v3.0.2
- uses: actions/checkout@v3.5.0
- name: Build with retry
uses: Wandalen/[email protected]
with:
Expand Down
25 changes: 14 additions & 11 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUBSECRET2 }}

- uses: actions/checkout@v3.0.2
- uses: actions/checkout@v3.5.0

- name: Extract branch name
shell: bash
Expand All @@ -29,14 +29,17 @@ jobs:
- name: Get tag
run: echo "The selected tag is ${{ steps.tag.outputs.TAG }}"

- name: Publish to Registry
uses: elgohr/[email protected]
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Quay.io
uses: docker/login-action@v2
with:
name: denbicloud/os_credits
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
dockerfile: Dockerfile
tags: ${{ steps.tag.outputs.TAG }}
buildoptions: "--no-cache"
attempt_limit: 3
attempt_delay: 5000
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_TOKEN }}
- name: Build and publish image to Quay
uses: docker/build-push-action@v4
with:
file: Dockerfile
push: true
tags: quay.io/denbicloud/os_credits:${{ steps.tag.outputs.TAG }}
20 changes: 13 additions & 7 deletions .github/workflows/releaseDocker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@ jobs:
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
- uses: actions/checkout@master
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@master
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Quay.io
uses: docker/login-action@v2
with:
name: denbicloud/os_credits
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
dockerfile: Dockerfile
tags: ${{ steps.get_version.outputs.VERSION }}
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_TOKEN }}
- name: Build and publish image to Quay
uses: docker/build-push-action@v4
with:
file: Dockerfile
push: true
tags: quay.io/denbicloud/os_credits:${{ steps.get_version.outputs.VERSION }}
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
- "./src:/code/src:ro"

timescaledb:
image: "timescale/timescaledb:2.7.2-pg14"
image: "timescale/timescaledb:2.10.1-pg14"
container_name: dev_timescaledb
command: postgres -c shared_preload_libraries=timescaledb
networks:
Expand Down
Loading

0 comments on commit 44268da

Please sign in to comment.