From 69e59359635e9dacb37deb2aef51cc67ee7d6604 Mon Sep 17 00:00:00 2001
From: truongpx-Mac <truongpx396@gmail.com>
Date: Wed, 18 Oct 2023 17:29:13 +0700
Subject: [PATCH] udpate

---
 jenkins-deploy/dockerfile/api.Dockerfile      | 53 ++++---------------
 jenkins-deploy/dockerfile/api.Dockerfile.old1 | 50 +++++++++++++++++
 jenkins-deploy/dockerfile/apiDockerfile.old   | 19 -------
 3 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100644 jenkins-deploy/dockerfile/api.Dockerfile.old1
 delete mode 100644 jenkins-deploy/dockerfile/apiDockerfile.old

diff --git a/jenkins-deploy/dockerfile/api.Dockerfile b/jenkins-deploy/dockerfile/api.Dockerfile
index 44d4c6ba4..0c7fe2e34 100644
--- a/jenkins-deploy/dockerfile/api.Dockerfile
+++ b/jenkins-deploy/dockerfile/api.Dockerfile
@@ -1,50 +1,19 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-# OpenIM base image: https://github.com/openim-sigs/openim-base-image
-
-# Set go mod installation source and proxy
-
-FROM golang:1.20 AS builder
-
-ARG GO111MODULE=on
-ARG GOPROXY=https://goproxy.cn,direct
-
-WORKDIR /openim/openim-server
-
-ENV GO111MODULE=$GO111MODULE
-ENV GOPROXY=$GOPROXY
-
-COPY go.mod go.sum ./
-RUN go mod download
+FROM golang:1.18.0 as build
 
+WORKDIR /openim
 COPY . .
 
-RUN make clean
-RUN make build BINS=openim-api
+RUN make fmt  \
+    && make tidy
+RUN make api
 
-# FROM ghcr.io/openim-sigs/openim-bash-image:latest
-FROM ghcr.io/openim-sigs/openim-bash-image:latest
+FROM ubuntu
 
-WORKDIR /openim/openim-server
+WORKDIR /openim
+VOLUME ["/openim/logs","/openim/bin"]
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=build /openim/bin /openim/bin
+COPY --from=build /openim/config /openim/config
 
-ENV PORT 10002
 EXPOSE 10002
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api /usr/bin/openim-api
-
-ENTRYPOINT ["bash", "-c", "openim-api -c $OPENIM_SERVER_CONFIG_NAME --port $PORT"]
+CMD ["./bin/openim-api","--port", "10002"]
diff --git a/jenkins-deploy/dockerfile/api.Dockerfile.old1 b/jenkins-deploy/dockerfile/api.Dockerfile.old1
new file mode 100644
index 000000000..44d4c6ba4
--- /dev/null
+++ b/jenkins-deploy/dockerfile/api.Dockerfile.old1
@@ -0,0 +1,50 @@
+# Copyright © 2023 OpenIM. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+# OpenIM base image: https://github.com/openim-sigs/openim-base-image
+
+# Set go mod installation source and proxy
+
+FROM golang:1.20 AS builder
+
+ARG GO111MODULE=on
+ARG GOPROXY=https://goproxy.cn,direct
+
+WORKDIR /openim/openim-server
+
+ENV GO111MODULE=$GO111MODULE
+ENV GOPROXY=$GOPROXY
+
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . .
+
+RUN make clean
+RUN make build BINS=openim-api
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
+
+WORKDIR /openim/openim-server
+
+COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
+COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+
+ENV PORT 10002
+EXPOSE 10002
+
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api /usr/bin/openim-api
+
+ENTRYPOINT ["bash", "-c", "openim-api -c $OPENIM_SERVER_CONFIG_NAME --port $PORT"]
diff --git a/jenkins-deploy/dockerfile/apiDockerfile.old b/jenkins-deploy/dockerfile/apiDockerfile.old
deleted file mode 100644
index 0c7fe2e34..000000000
--- a/jenkins-deploy/dockerfile/apiDockerfile.old
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM golang:1.18.0 as build
-
-WORKDIR /openim
-COPY . .
-
-RUN make fmt  \
-    && make tidy
-RUN make api
-
-FROM ubuntu
-
-WORKDIR /openim
-VOLUME ["/openim/logs","/openim/bin"]
-
-COPY --from=build /openim/bin /openim/bin
-COPY --from=build /openim/config /openim/config
-
-EXPOSE 10002
-CMD ["./bin/openim-api","--port", "10002"]