Merge pull request #24 from planetscale/docker/planetscale-git-image

planetscale · Jul 26, 2023 · 9eaa3a6 · 9eaa3a6
2 parents dbd4842 + a6c9727
commit 9eaa3a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -3,7 +3,12 @@ name: ci
 on:
  push:
  branches:
- - "*"
+ - main
+ pull_request:
+ types:
+ - opened
+ - reopened
+ - synchronize
 
 permissions:
  # these perms needed for goreleaser to publish releases and docker images (https://goreleaser.com/ci/actions/#token-permissions):
@@ -13,7 +18,6 @@ permissions:
 jobs:
  test:
  runs-on: ubuntu-latest
- if: github.event_name == 'push' && !contains(toJson(github.event.commits), '[ci skip]') && !contains(toJson(github.event.commits), '[skip ci]')
  steps:
  - uses: actions/checkout@v3
 
@@ -33,6 +37,7 @@ jobs:
 
  - run: make lint
  - run: make test
+ - run: make snapshot
 
  release:
  needs: [test]

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,5 @@
 # syntax=docker/dockerfile:1.4
-# cgr.dev/chainguard/git:2.41.0:
-FROM cgr.dev/chainguard/git@sha256:549b8c78695131d41018e12e1c21107322227fd0669126f4bf13d00bf64cac6c
+FROM us-docker.pkg.dev/planetscale-registry/wolfi-public/git:2.41.0
 
 COPY ghcommit /ghcommit