From cc5fa648de17cb810063634c52dc47019b9a78cd Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com>
Date: Wed, 30 Aug 2023 20:19:37 +0800
Subject: [PATCH] feat: add docker buildx images is openim-web

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
---
 build/goreleaser.yaml                     | 15 ++++++++-------
 build/images/openim-msggateway/Dockerfile |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build/goreleaser.yaml b/build/goreleaser.yaml
index 173ff1368..ecd031921 100644
--- a/build/goreleaser.yaml
+++ b/build/goreleaser.yaml
@@ -393,6 +393,14 @@ archives:
       {{- else if eq .Arch "386" }}i386
       {{- else }}{{ .Arch }}{{ end }}
       {{- if .Arm }}v{{ .Arm }}{{ end }}
+
+    # Set this to true if you want all files in the archive to be in a single directory.
+    # If set to true and you extract the archive 'goreleaser_Linux_arm64.tar.gz',
+    # you'll get a folder 'goreleaser_Linux_arm64'.
+    # If set to false, all files are extracted separately.
+    # You can also set it to a custom folder name (templating is supported).
+    wrap_in_directory: true
+
     # use zip for windows archives
     files:
       - CHANGELOG/*
@@ -406,13 +414,6 @@ archives:
       - src: "*.md"
         dst: docs
 
-        # Set this to true if you want all files in the archive to be in a single directory.
-        # If set to true and you extract the archive 'goreleaser_Linux_arm64.tar.gz',
-        # you'll get a folder 'goreleaser_Linux_arm64'.
-        # If set to false, all files are extracted separately.
-        # You can also set it to a custom folder name (templating is supported).
-        wrap_in_directory: true
-
         # Strip parent folders when adding files to the archive.
         strip_parent: true
 
diff --git a/build/images/openim-msggateway/Dockerfile b/build/images/openim-msggateway/Dockerfile
index c823643cb..1ebf31c69 100644
--- a/build/images/openim-msggateway/Dockerfile
+++ b/build/images/openim-msggateway/Dockerfile
@@ -41,9 +41,9 @@ 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 10140
-ENV WS_PORT 10001
-ENV CONFIG=/openim/openim-server/config
+ENV PORT 10140 \
+    WS_PORT 10001 \
+    CONFIG=/openim/openim-server/config
 
 EXPOSE $PORT
 EXPOSE $WS_PORT