Skip to content

Commit

Permalink
Update ci pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
mrfelton committed Feb 13, 2024
1 parent a904215 commit 173f922
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
- uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # pin@v3
- uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # pin@v5
with:
context: .
push: true
tags: ${{ env.DOCKERHUB_IMAGE }}:dev
tags: |
${{ env.DOCKERHUB_IMAGE }}:dev
platforms: linux/amd64,linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max
12 changes: 1 addition & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ jobs:
runs-on: "ubuntu-latest"

env:
GAR_REGISTRY: us-east1-docker.pkg.dev
GAR_IMAGE: zap-strike-infrastructure/zap-container-registry/bitcoin-blended-fee-estimator
DOCKERHUB_IMAGE: lnzap/bitcoin-blended-fee-estimator

steps:
Expand All @@ -20,12 +18,6 @@ jobs:
- name: Set version
run: echo "VERSION=$(echo ${{ github.ref }} | awk -F 'v' '{print $2}')" >> $GITHUB_ENV

- name: 'Setup Google Artifact Registry'
uses: LN-Zap/zap-github-actions/.github/actions/setup-google-artifact-registry@master
with:
registry: us-east1-docker.pkg.dev
credentials: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS_ARTIFACT_REGISTRY }}

- name: Dockerhub login
run: "docker login --username ${{ secrets.DOCKER_USERNAME }} --password ${{ secrets.DOCKER_PASSWORD }}"

Expand All @@ -35,10 +27,8 @@ jobs:
with:
push: true
tags: |
${{ env.GAR_REGISTRY }}/${{ env.GAR_IMAGE }}:${{ env.VERSION }}
${{ env.GAR_REGISTRY }}/${{ env.GAR_IMAGE }}:latest
${{ env.DOCKERHUB_IMAGE }}:latest
${{ env.DOCKERHUB_IMAGE }}:${{ env.VERSION }}
platforms: linux/amd64,linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=min
cache-to: type=gha,mode=max

0 comments on commit 173f922

Please sign in to comment.