This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 4e853024ea [Chore] Fix publish docker error in CI due to deploy failed
(#16667)
4e853024ea is described below
commit 4e853024ea8a7fc1fccd22c7728210d7a434f84f
Author: xiangzihao <460888...@qq.com>
AuthorDate: Fri Sep 27 15:38:11 2024 +0800
[Chore] Fix publish docker error in CI due to deploy failed (#16667)
---
.github/workflows/api-test.yml | 1 -
.github/workflows/codeql.yaml | 1 -
.github/workflows/e2e-k8s.yml | 1 -
.github/workflows/e2e.yml | 1 -
.github/workflows/publish-docker.yaml | 1 -
.github/workflows/publish-nexus.yaml | 1 +
docs/docs/en/contribute/development-environment-setup.md | 2 --
docs/docs/en/contribute/release.md | 6 +++---
docs/docs/zh/contribute/development-environment-setup.md | 2 --
docs/docs/zh/contribute/release.md | 6 +++---
dolphinscheduler-dist/pom.xml | 2 +-
pom.xml | 1 +
12 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/api-test.yml b/.github/workflows/api-test.yml
index 6c6c2a85f6..fffebe801a 100644
--- a/.github/workflows/api-test.yml
+++ b/.github/workflows/api-test.yml
@@ -81,7 +81,6 @@ jobs:
run: |
./mvnw -B clean install \
-Dmaven.test.skip=true \
- -Dmaven.javadoc.skip=true \
-Dspotless.skip=true \
-Pdocker,staging -Ddocker.tag=ci
- name: Export Docker Images
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 79859e3df6..da71ea860c 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -51,7 +51,6 @@ jobs:
- run: |
./mvnw -B clean install \
-Dmaven.test.skip \
- -Dmaven.javadoc.skip \
-Dspotless.skip=true \
-Prelease
diff --git a/.github/workflows/e2e-k8s.yml b/.github/workflows/e2e-k8s.yml
index d78d785773..30715f1dc8 100644
--- a/.github/workflows/e2e-k8s.yml
+++ b/.github/workflows/e2e-k8s.yml
@@ -71,7 +71,6 @@ jobs:
run: |
./mvnw -B clean package \
-Dmaven.test.skip=true \
- -Dmaven.javadoc.skip=true \
-Dspotless.skip=true \
-Pdocker,staging -Ddocker.tag=ci
- name: Create k8s Kind Cluster
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c88899a4dc..eb43d40592 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -83,7 +83,6 @@ jobs:
run: |
./mvnw -B clean install \
-Dmaven.test.skip=true \
- -Dmaven.javadoc.skip=true \
-Dspotless.skip=true \
-Pdocker,staging -Ddocker.tag=ci
- name: Export Docker Images
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 2d04204d7a..6050469852 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -85,7 +85,6 @@ jobs:
run: |
./mvnw -B clean deploy \
-Dmaven.test.skip \
- -Dmaven.javadoc.skip \
-Dspotless.skip=true \
-Ddocker.tag=${{ env.DOCKER_TAG }} \
-Ddocker.hub=${{ env.HUB }} \
diff --git a/.github/workflows/publish-nexus.yaml
b/.github/workflows/publish-nexus.yaml
index e430bb036f..9519e707b8 100644
--- a/.github/workflows/publish-nexus.yaml
+++ b/.github/workflows/publish-nexus.yaml
@@ -72,4 +72,5 @@ jobs:
-s ${{ env.SETTINGS_PATH }} \
-Dmaven.test.skip=true \
-Dspotless.skip=true \
+ -Dmaven.deploy.skip=false \
-Pstaging
diff --git a/docs/docs/en/contribute/development-environment-setup.md
b/docs/docs/en/contribute/development-environment-setup.md
index 5da55fced2..8efa667eb4 100644
--- a/docs/docs/en/contribute/development-environment-setup.md
+++ b/docs/docs/en/contribute/development-environment-setup.md
@@ -64,7 +64,6 @@ DolphinScheduler will release new Docker images after it
released, you could fin
cd dolphinscheduler
./mvnw -B clean package \
-Dmaven.test.skip \
- -Dmaven.javadoc.skip \
-Dspotless.skip = true \
-Ddocker.tag=<TAG> \
-Pdocker,release
@@ -78,7 +77,6 @@ When the command is finished you could find them by command
`docker images`.
cd dolphinscheduler
./mvnw -B clean deploy \
-Dmaven.test.skip \
- -Dmaven.javadoc.skip \
-Dspotless.skip = true \
-Ddocker.tag=<TAG> \
-Ddocker.hub=<HUB_URL> \
diff --git a/docs/docs/en/contribute/release.md
b/docs/docs/en/contribute/release.md
index 1ee8979428..683ffa9965 100644
--- a/docs/docs/en/contribute/release.md
+++ b/docs/docs/en/contribute/release.md
@@ -225,7 +225,7 @@ git push "${GH_REMOTE}" "${VERSION}"-release
> first to clone the source code. And then make sure you set
> `GH_REMOTE="origin"` to make all command work fine.
```shell
-mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
+mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true
-DdryRun=true -Dusername="${GH_USERNAME}"
```
- `-Prelease`: choose release profile, which will pack all the source codes,
jar files and executable binary packages.
@@ -243,7 +243,7 @@ mvn release:clean
Then, prepare to execute the release.
```shell
-mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
+mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true
-DpushChanges=false -Dusername="${GH_USERNAME}"
```
It is basically the same as the previous rehearsal command, but deleting
`-DdryRun=true` parameter.
@@ -275,7 +275,7 @@ git push "${GH_REMOTE}" --tags
#### Maven Release Deploy
```shell
-mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
+mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true
-Dusername="${GH_USERNAME}"
```
After that command is executed, the version to be released will be uploaded to
Apache staging repository automatically.
diff --git a/docs/docs/zh/contribute/development-environment-setup.md
b/docs/docs/zh/contribute/development-environment-setup.md
index d6b56de30d..53c7245944 100644
--- a/docs/docs/zh/contribute/development-environment-setup.md
+++ b/docs/docs/zh/contribute/development-environment-setup.md
@@ -61,7 +61,6 @@ DolphinScheduler 每次发版都会同时发布 Docker 镜像，你可以在 [Do
cd dolphinscheduler
./mvnw -B clean package \
-Dmaven.test.skip \
- -Dmaven.javadoc.skip \
-Dspotless.skip=true \
-Ddocker.tag=<TAG> \
-Pdocker,release
@@ -75,7 +74,6 @@ cd dolphinscheduler
cd dolphinscheduler
./mvnw -B clean deploy \
-Dmaven.test.skip \
- -Dmaven.javadoc.skip \
-Dspotless.skip = true \
-Ddocker.tag=<TAG> \
-Ddocker.hub=<HUB_URL> \
diff --git a/docs/docs/zh/contribute/release.md
b/docs/docs/zh/contribute/release.md
index b5c61fcfed..26338f8703 100644
--- a/docs/docs/zh/contribute/release.md
+++ b/docs/docs/zh/contribute/release.md
@@ -232,7 +232,7 @@ git push "${GH_REMOTE}" "${VERSION}"-release
```shell
# 运行发版校验
-mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
+mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true
-DdryRun=true -Dusername="${GH_USERNAME}"
```
- `-Prelease`: 选择 release 的 profile，这个 profile 会打包所有源码、jar 文件以及可执行二进制包。
@@ -250,7 +250,7 @@ mvn release:clean
然后准备执行发布。
```shell
-mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
+mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true
-DpushChanges=false -Dusername="${GH_USERNAME}"
```
和上一步演练的命令基本相同，去掉了 `-DdryRun=true` 参数。
@@ -279,7 +279,7 @@ git push "${GH_REMOTE}" --tags
#### 部署发布
```shell
-mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
+mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true
-Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true
-Dusername="${GH_USERNAME}"
```
执行完该命令后，待发布版本会自动上传到 Apache 的临时筹备仓库(staging repository)。你可以通过访问 [apache staging
repositories](https://repository.apache.org/#stagingRepositories)
diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml
index c9b5814456..b0b5b7f9a0 100644
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@@ -181,7 +181,7 @@
<environmentVariables>
<DOCKER_BUILDKIT>1</DOCKER_BUILDKIT>
</environmentVariables>
- <executable>docker</executable>
+ <executable>bash</executable>
<workingDirectory>${project.basedir}</workingDirectory>
<arguments>
<argument>src/main/docker/docker-push.sh</argument>
diff --git a/pom.xml b/pom.xml
index 2dd7aba16b..c833b2deab 100755
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@
<build.plugins.skip>false</build.plugins.skip>
<build.assembly.skip>true</build.assembly.skip>
<spotless.skip>false</spotless.skip>
+ <maven.deploy.skip>true</maven.deploy.skip>
<skipUT>false</skipUT>
</properties>
