From 3777d82d016df0c2ff1a00dfecf8d5fb94f2401e Mon Sep 17 00:00:00 2001 From: Jordan Dubrick Date: Wed, 29 May 2024 09:23:33 -0400 Subject: [PATCH 1/2] fix typo (#242) Signed-off-by: Jordan Dubrick --- oci-registry/build-multi-arch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oci-registry/build-multi-arch.sh b/oci-registry/build-multi-arch.sh index f8857f4e..ade1e7b0 100644 --- a/oci-registry/build-multi-arch.sh +++ b/oci-registry/build-multi-arch.sh @@ -76,6 +76,6 @@ else # Push and delete local manifest docker manifest push "$DEFAULT_MANIFEST" - docker manifest rm "$$DEFAULT_MANIFEST" + docker manifest rm "$DEFAULT_MANIFEST" fi \ No newline at end of file From 9de6fb93aed6656357b4b14563871ded5c2235e2 Mon Sep 17 00:00:00 2001 From: Jordan Dubrick Date: Thu, 30 May 2024 14:39:41 -0400 Subject: [PATCH 2/2] bump golang 1.19 image to latest sha (#244) Signed-off-by: Jordan Dubrick --- .ci/Dockerfile | 2 +- index/server/Dockerfile | 2 +- tests/integration/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index 6aef70ac..38c66dc0 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.19-alpine@sha256:276692412aea6f9dd6cdc5725b2f1c05bef8df7223811afbc6aa16294e2903f9 AS builder +FROM golang:1.19-alpine@sha256:0ec0646e208ea58e5d29e558e39f2e59fccf39b7bda306cb53bbaff91919eca5 AS builder # Install dependencies RUN apk add --no-cache git bash curl zip diff --git a/index/server/Dockerfile b/index/server/Dockerfile index 04919670..19a0cd9b 100644 --- a/index/server/Dockerfile +++ b/index/server/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. # Index Server build stage -FROM golang:1.19-alpine@sha256:276692412aea6f9dd6cdc5725b2f1c05bef8df7223811afbc6aa16294e2903f9 AS index-builder +FROM golang:1.19-alpine@sha256:0ec0646e208ea58e5d29e558e39f2e59fccf39b7bda306cb53bbaff91919eca5 AS index-builder WORKDIR /tools COPY . . RUN CGO_ENABLED=0 go build -mod=vendor -o index-server main.go diff --git a/tests/integration/Dockerfile b/tests/integration/Dockerfile index 02189d3e..4bebef18 100644 --- a/tests/integration/Dockerfile +++ b/tests/integration/Dockerfile @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.19-alpine@sha256:276692412aea6f9dd6cdc5725b2f1c05bef8df7223811afbc6aa16294e2903f9 +FROM golang:1.19-alpine@sha256:0ec0646e208ea58e5d29e558e39f2e59fccf39b7bda306cb53bbaff91919eca5 WORKDIR /registry-test