From 29596f5d1945de76ee06c8b0a6f94c345c84164d Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 16 Oct 2024 11:24:26 +0800 Subject: [修改] 修改Dockerfile变量名称 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- galaxy-job-executor/docker/Dockerfile | 4 ++-- galaxy-job-executor/docker/assembly.xml | 2 +- 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 @@ - config + ${project.build.directory}/classes/ /config -- cgit v1.2.3 From 530a95214ae7fce2d6f4e8b0cfa2ac5e4c4e31cc Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 16 Oct 2024 12:09:33 +0800 Subject: [修改] 修改gitlab-ci基础镜像 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e468c1..21c9392 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: 192.168.40.153:8082/common/maven:3.8.2-jdk-8-slim +image: 192.168.40.153:8082/common/maven:3.8.2-jdk-8-docker-slim variables: MAVEN_CLI_OPTS: --batch-mode --errors --show-version -- cgit v1.2.3 From 8cd374f694afacb7a01a8c184ca615c5d4101bd8 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 16 Oct 2024 13:46:48 +0800 Subject: [修改] 修改gitlab-ci基础镜像 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21c9392..ed30a93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,9 @@ clean: deploy: stage: deploy + image: docker:latest + services: + - docker:dind script: - echo 'exec mvn package & docker build' - echo 'tag:' $CI_COMMIT_TAG -- cgit v1.2.3 From 175021307d719958458bd261d28da55c96a537fb Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 16 Oct 2024 13:59:59 +0800 Subject: [修改] 修改gitlab-ci基础镜像 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed30a93..c149bbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,3 @@ -image: 192.168.40.153:8082/common/maven:3.8.2-jdk-8-docker-slim - variables: MAVEN_CLI_OPTS: --batch-mode --errors --show-version @@ -31,9 +29,6 @@ clean: deploy: stage: deploy - image: docker:latest - services: - - docker:dind script: - echo 'exec mvn package & docker build' - echo 'tag:' $CI_COMMIT_TAG -- cgit v1.2.3