Merge branch 'main' into policy-type

ratify-project · Sep 21, 2023 · 9548899 · 9548899
2 parents c6398a0 + 9dc3f09
commit 9548899
Show file tree

Hide file tree

Showing 9 changed files with 1,060 additions and 16 deletions.
diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml
@@ -46,7 +46,7 @@ jobs:
         run: |
           echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
       - name: docker login
-        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

diff --git a/.github/workflows/publish-sample.yml b/.github/workflows/publish-sample.yml
@@ -23,7 +23,7 @@ jobs:
           echo "REPOSITORY=${{ env.REGISTRY }}/${{ github.repository }}" >> $GITHUB_ENV
 
       - name: Log in to the GHCR
-        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -141,13 +141,18 @@ Follow the steps below to build and deploy a Ratify image with your private chan
 #### build an image with your local changes
 
 ```bash
-docker build -f httpserver/Dockerfile -t yourregistry/deislabs/ratify:yourtag .
+export REGISTRY=yourregistry
+docker buildx create --use
+
+docker buildx build -f httpserver/Dockerfile --platform linux/amd64 --build-arg build_cosign=true --build-arg build_sbom=true --build-arg build_licensechecker=true --build-arg build_schemavalidator=true -t ${REGISTRY}/deislabs/ratify:yourtag .
+docker build --progress=plain --build-arg KUBE_VERSION="1.25.0" --build-arg TARGETOS="linux" --build-arg TARGETARCH="amd64" -f crd.Dockerfile -t ${REGISTRY}/localbuildcrd:yourtag ./charts/ratify/crds
 ```
 
 #### [Authenticate](https://docs.docker.com/engine/reference/commandline/login/#usage) with your registry,  and push the newly built image
 
 ```bash
-docker push yourregistry/deislabs/ratify:yourtag
+docker push ${REGISTRY}/deislabs/ratify:yourtag
+docker push ${REGISTRY}/localbuildcrd:yourtag
 ```
 
 ### Deploy using Dev Helmfile