From 74e32829f9947bfba4acf1a2520c85761135421c Mon Sep 17 00:00:00 2001
From: rambohe <linbo.hlb@alibaba-inc.com>
Date: Wed, 24 May 2023 15:26:07 +0800
Subject: [PATCH] revert yurt-tunnel components release (#1484)

---
 Makefile                                           |  9 ++++++++-
 .../release/Dockerfile.yurt-tunnel-agent           | 14 ++++++++++++++
 .../release/Dockerfile.yurt-tunnel-server          | 14 ++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent
 create mode 100644 hack/dockerfiles/release/Dockerfile.yurt-tunnel-server

diff --git a/Makefile b/Makefile
index 64b299d2dee..49fe17030f4 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ docker-build:
 
 
 # Build and Push the docker images with multi-arch
-docker-push: docker-push-yurthub docker-push-node-servant docker-push-yurt-manager
+docker-push: docker-push-yurthub docker-push-node-servant docker-push-yurt-manager docker-push-yurt-tunnel-server docker-push-yurt-tunnel-agent
 
 
 docker-buildx-builder:
@@ -165,6 +165,13 @@ docker-push-node-servant: docker-buildx-builder
 docker-push-yurt-manager: manifests docker-buildx-builder
 	docker buildx build --no-cache --push ${DOCKER_BUILD_ARGS}  --platform ${TARGET_PLATFORMS} -f hack/dockerfiles/release/Dockerfile.yurt-manager . -t ${IMAGE_REPO}/yurt-manager:${GIT_VERSION}
 
+docker-push-yurt-tunnel-server: docker-buildx-builder
+	docker buildx build --no-cache --push ${DOCKER_BUILD_ARGS}  --platform ${TARGET_PLATFORMS} -f hack/dockerfiles/release/Dockerfile.yurt-tunnel-server . -t ${IMAGE_REPO}/yurt-tunnel-server:${GIT_VERSION}
+
+docker-push-yurt-tunnel-agent: docker-buildx-builder
+	docker buildx build --no-cache --push ${DOCKER_BUILD_ARGS}  --platform ${TARGET_PLATFORMS} -f hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent . -t ${IMAGE_REPO}/yurt-tunnel-agent:${GIT_VERSION}
+
+
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 #	hack/make-rule/generate_openapi.sh // TODO by kadisi
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./pkg/apis/..."
diff --git a/hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent b/hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent
new file mode 100644
index 00000000000..112d192cb8f
--- /dev/null
+++ b/hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent
@@ -0,0 +1,14 @@
+# multi-arch image building for yurt-tunnel-agent
+
+FROM --platform=${BUILDPLATFORM} golang:1.18 as builder
+ADD . /build
+ARG TARGETOS TARGETARCH GIT_VERSION GOPROXY MIRROR_REPO
+WORKDIR /build/
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GIT_VERSION=${GIT_VERSION} make build WHAT=cmd/yurt-tunnel-agent
+
+FROM --platform=${TARGETPLATFORM} alpine:3.17
+ARG TARGETOS TARGETARCH MIRROR_REPO
+RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
+    apk add ca-certificates bash libc6-compat && update-ca-certificates && rm /var/cache/apk/*
+COPY --from=builder /build/_output/local/bin/${TARGETOS}/${TARGETARCH}/yurt-tunnel-agent /usr/local/bin/yurt-tunnel-agent
+ENTRYPOINT ["/usr/local/bin/yurt-tunnel-agent"]
\ No newline at end of file
diff --git a/hack/dockerfiles/release/Dockerfile.yurt-tunnel-server b/hack/dockerfiles/release/Dockerfile.yurt-tunnel-server
new file mode 100644
index 00000000000..860951e7b79
--- /dev/null
+++ b/hack/dockerfiles/release/Dockerfile.yurt-tunnel-server
@@ -0,0 +1,14 @@
+# multi-arch image building for yurt-tunnel-server
+
+FROM --platform=${BUILDPLATFORM} golang:1.18 as builder
+ADD . /build
+ARG TARGETOS TARGETARCH GIT_VERSION GOPROXY MIRROR_REPO
+WORKDIR /build/
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GIT_VERSION=${GIT_VERSION} make build WHAT=cmd/yurt-tunnel-server
+
+FROM --platform=${TARGETPLATFORM} alpine:3.17
+ARG TARGETOS TARGETARCH MIRROR_REPO
+RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
+    apk add ca-certificates bash libc6-compat iptables ip6tables conntrack-tools && update-ca-certificates && rm /var/cache/apk/*
+COPY --from=builder /build/_output/local/bin/${TARGETOS}/${TARGETARCH}/yurt-tunnel-server /usr/local/bin/yurt-tunnel-server
+ENTRYPOINT ["/usr/local/bin/yurt-tunnel-server"]
\ No newline at end of file