refactor: update docker copy filename

chuntaojun · Jul 11, 2022 · 1583a71 · 1583a71
1 parent e4fed82
commit 1583a71
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/docker-standalone.yml b/.github/workflows/docker-standalone.yml
@@ -65,15 +65,11 @@ jobs:
           mv ../vm/port.properties ./port.properties
           mv ../vm/Dockerfile ./Dockerfile
 
-          mv ${SERVER_PKG_NAME} polaris-server-release.zip
-          mv ${CONSOLE_PKG_NAME} polaris-console-release.zip
-          mv prometheus-2.28.0.${GOOS}-${GOARCH}.tar.gz prometheus-release.tar.gz
-
           docker_repository="polarismesh"
           docker_image="polaris-server-standalone"
           docker_tag=${SERVER_VERSION}
 
-          docker build --network=host -t ${docker_repository}/${docker_image}:${docker_tag} ./
+          docker build --network=host --build-arg SERVER_VERSION="${SERVER_VERSION}" --build-arg CONSOLE_VERSION="${CONSOLE_VERSION}" -t ${docker_repository}/${docker_image}:${docker_tag} ./
 
           docker push ${docker_repository}/${docker_image}:${docker_tag}
           docker tag ${docker_repository}/${docker_image}:${docker_tag} ${docker_repository}/${docker_image}:latest

diff --git a/deploy/standalone/vm/Dockerfile b/deploy/standalone/vm/Dockerfile
@@ -1,3 +1,8 @@
+ARG SERVER_VERSION=v1.10.0
+ARG CONSOLE_VERSION=v1.7.1
+ARG GOOS=linux
+ARG GOARCH=amd64
+
 FROM ubuntu:latest
 
 LABEL cn.polarismesh.image.authors="polaris"
@@ -6,9 +11,9 @@ LABEL cn.polarismesh.image.documentation="https://polarismesh.cn/#/"
 RUN apt-get -y update
 RUN apt-get install -y lsof curl unzip
 
-COPY polaris-server-release.zip /root/polaris-server-release.zip
-COPY polaris-console-release.zip /root/polaris-console-release.zip
-COPY prometheus-release.tar.gz /root/prometheus-release.tar.gz
+COPY polaris-server-release_${SERVER_VERSION}.${GOOS}.${GOARCH}.zip /root/polaris-server-release_${SERVER_VERSION}.${GOOS}.${GOARCH}.zip
+COPY polaris-console-release_${CONSOLE_VERSION}.${GOOS}.${GOARCH}.zip /root/polaris-console-release_${CONSOLE_VERSION}.${GOOS}.${GOARCH}.zip
+COPY prometheus-2.28.0.${GOOS}-${GOARCH}.tar.gz /root/prometheus-2.28.0.${GOOS}-${GOARCH}.tar.gz
 COPY install.sh /root/install.sh
 COPY port.properties /root/port.properties