From 2b443f3df592aa281f47f841f919f4e553f8d333 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Mon, 5 Sep 2022 14:48:56 +0200
Subject: [PATCH] switch Dockerfile to BCI one

---
 Dockerfile          | 51 +--------------------------------------------
 Dockerfile.upstream | 50 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 50 deletions(-)
 mode change 100644 => 120000 Dockerfile
 create mode 100644 Dockerfile.upstream

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index b9a840f5..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-# syntax=docker/dockerfile:1.3
-
-ARG GO_VERSION=1.17
-ARG GORELEASER_XX_VERSION=1.2.5
-
-FROM --platform=$BUILDPLATFORM crazymax/goreleaser-xx:${GORELEASER_XX_VERSION} AS goreleaser-xx
-FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS base
-COPY --from=goreleaser-xx / /
-RUN apk add --no-cache file git
-WORKDIR /src
-
-FROM base AS build
-ENV GO111MODULE=auto
-ENV CGO_ENABLED=0
-# GIT_REF is used by goreleaser-xx to handle the proper git ref when available.
-# It will fallback to the working tree info if empty and use "git tag --points-at"
-# or "git describe" to define the version info.
-ARG GIT_REF
-ARG TARGETPLATFORM
-ARG PKG="github.com/distribution/distribution/v3"
-ARG BUILDTAGS="include_oss include_gcs"
-RUN --mount=type=bind,target=/src,rw \
-  --mount=type=cache,target=/root/.cache/go-build \
-  --mount=target=/go/pkg/mod,type=cache \
-  goreleaser-xx --debug \
-    --name="registry" \
-    --dist="/out" \
-    --main="./cmd/registry" \
-    --flags="-v" \
-    --ldflags="-s -w -X '$PKG/version.Version={{.Version}}' -X '$PKG/version.Revision={{.Commit}}' -X '$PKG/version.Package=$PKG'" \
-    --tags="$BUILDTAGS" \
-    --files="LICENSE" \
-    --files="README.md"
-
-FROM scratch AS artifact
-COPY --from=build /out/*.tar.gz /
-COPY --from=build /out/*.zip /
-COPY --from=build /out/*.sha256 /
-
-FROM scratch AS binary
-COPY --from=build /usr/local/bin/registry* /
-
-FROM alpine:3.15
-RUN apk add --no-cache ca-certificates
-COPY cmd/registry/config-dev.yml /etc/docker/registry/config.yml
-COPY --from=build /usr/local/bin/registry /bin/registry
-VOLUME ["/var/lib/registry"]
-EXPOSE 5000
-ENTRYPOINT ["registry"]
-CMD ["serve", "/etc/docker/registry/config.yml"]
diff --git a/Dockerfile b/Dockerfile
new file mode 120000
index 00000000..9d846690
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1 @@
+Dockerfile.bci
\ No newline at end of file
diff --git a/Dockerfile.upstream b/Dockerfile.upstream
new file mode 100644
index 00000000..b9a840f5
--- /dev/null
+++ b/Dockerfile.upstream
@@ -0,0 +1,50 @@
+# syntax=docker/dockerfile:1.3
+
+ARG GO_VERSION=1.17
+ARG GORELEASER_XX_VERSION=1.2.5
+
+FROM --platform=$BUILDPLATFORM crazymax/goreleaser-xx:${GORELEASER_XX_VERSION} AS goreleaser-xx
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS base
+COPY --from=goreleaser-xx / /
+RUN apk add --no-cache file git
+WORKDIR /src
+
+FROM base AS build
+ENV GO111MODULE=auto
+ENV CGO_ENABLED=0
+# GIT_REF is used by goreleaser-xx to handle the proper git ref when available.
+# It will fallback to the working tree info if empty and use "git tag --points-at"
+# or "git describe" to define the version info.
+ARG GIT_REF
+ARG TARGETPLATFORM
+ARG PKG="github.com/distribution/distribution/v3"
+ARG BUILDTAGS="include_oss include_gcs"
+RUN --mount=type=bind,target=/src,rw \
+  --mount=type=cache,target=/root/.cache/go-build \
+  --mount=target=/go/pkg/mod,type=cache \
+  goreleaser-xx --debug \
+    --name="registry" \
+    --dist="/out" \
+    --main="./cmd/registry" \
+    --flags="-v" \
+    --ldflags="-s -w -X '$PKG/version.Version={{.Version}}' -X '$PKG/version.Revision={{.Commit}}' -X '$PKG/version.Package=$PKG'" \
+    --tags="$BUILDTAGS" \
+    --files="LICENSE" \
+    --files="README.md"
+
+FROM scratch AS artifact
+COPY --from=build /out/*.tar.gz /
+COPY --from=build /out/*.zip /
+COPY --from=build /out/*.sha256 /
+
+FROM scratch AS binary
+COPY --from=build /usr/local/bin/registry* /
+
+FROM alpine:3.15
+RUN apk add --no-cache ca-certificates
+COPY cmd/registry/config-dev.yml /etc/docker/registry/config.yml
+COPY --from=build /usr/local/bin/registry /bin/registry
+VOLUME ["/var/lib/registry"]
+EXPOSE 5000
+ENTRYPOINT ["registry"]
+CMD ["serve", "/etc/docker/registry/config.yml"]