summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhanghongqing <[email protected]>2024-10-16 11:24:26 +0800
committerzhanghongqing <[email protected]>2024-10-16 11:24:26 +0800
commit29596f5d1945de76ee06c8b0a6f94c345c84164d (patch)
tree8de8c917e0721501ef87216750e8604e8099d4d6
parent041a64f61b26820a615e671eb15ac58d0a3b5f3f (diff)
[修改] 修改Dockerfile变量名称
-rw-r--r--galaxy-job-executor/docker/Dockerfile4
-rw-r--r--galaxy-job-executor/docker/assembly.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/galaxy-job-executor/docker/Dockerfile b/galaxy-job-executor/docker/Dockerfile
index 0a9721c..ab8775c 100644
--- a/galaxy-job-executor/docker/Dockerfile
+++ b/galaxy-job-executor/docker/Dockerfile
@@ -1,8 +1,8 @@
ARG JDK_IMAGE
-ARG GOLANG_IMAGE
+ARG GO_IMAGE
#编译环境,生成二进制文件
#FROM 192.168.40.153:9080/common/golang:1.15.6 as builder
-FROM ${GOLANG_IMAGE} as builder
+FROM ${GO_IMAGE} as builder
WORKDIR /build
COPY xjar.go /build/
diff --git a/galaxy-job-executor/docker/assembly.xml b/galaxy-job-executor/docker/assembly.xml
index 78d34c4..cf97c22 100644
--- a/galaxy-job-executor/docker/assembly.xml
+++ b/galaxy-job-executor/docker/assembly.xml
@@ -11,7 +11,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>config</directory>
+ <directory>${project.build.directory}/classes/</directory>
<outputDirectory>/config</outputDirectory>
</fileSet>
</fileSets>