Browse Source

[Chore] Fix publish docker error in CI due to deploy failed (#16667)

dev
xiangzihao 2 months ago committed by GitHub
parent
commit
4e853024ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      .github/workflows/api-test.yml
  2. 1
      .github/workflows/codeql.yaml
  3. 1
      .github/workflows/e2e-k8s.yml
  4. 1
      .github/workflows/e2e.yml
  5. 1
      .github/workflows/publish-docker.yaml
  6. 1
      .github/workflows/publish-nexus.yaml
  7. 2
      docs/docs/en/contribute/development-environment-setup.md
  8. 6
      docs/docs/en/contribute/release.md
  9. 2
      docs/docs/zh/contribute/development-environment-setup.md
  10. 6
      docs/docs/zh/contribute/release.md
  11. 2
      dolphinscheduler-dist/pom.xml
  12. 1
      pom.xml

1
.github/workflows/api-test.yml

@ -81,7 +81,6 @@ jobs:
run: | run: |
./mvnw -B clean install \ ./mvnw -B clean install \
-Dmaven.test.skip=true \ -Dmaven.test.skip=true \
-Dmaven.javadoc.skip=true \
-Dspotless.skip=true \ -Dspotless.skip=true \
-Pdocker,staging -Ddocker.tag=ci -Pdocker,staging -Ddocker.tag=ci
- name: Export Docker Images - name: Export Docker Images

1
.github/workflows/codeql.yaml

@ -51,7 +51,6 @@ jobs:
- run: | - run: |
./mvnw -B clean install \ ./mvnw -B clean install \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \
-Dspotless.skip=true \ -Dspotless.skip=true \
-Prelease -Prelease

1
.github/workflows/e2e-k8s.yml

@ -71,7 +71,6 @@ jobs:
run: | run: |
./mvnw -B clean package \ ./mvnw -B clean package \
-Dmaven.test.skip=true \ -Dmaven.test.skip=true \
-Dmaven.javadoc.skip=true \
-Dspotless.skip=true \ -Dspotless.skip=true \
-Pdocker,staging -Ddocker.tag=ci -Pdocker,staging -Ddocker.tag=ci
- name: Create k8s Kind Cluster - name: Create k8s Kind Cluster

1
.github/workflows/e2e.yml

@ -83,7 +83,6 @@ jobs:
run: | run: |
./mvnw -B clean install \ ./mvnw -B clean install \
-Dmaven.test.skip=true \ -Dmaven.test.skip=true \
-Dmaven.javadoc.skip=true \
-Dspotless.skip=true \ -Dspotless.skip=true \
-Pdocker,staging -Ddocker.tag=ci -Pdocker,staging -Ddocker.tag=ci
- name: Export Docker Images - name: Export Docker Images

1
.github/workflows/publish-docker.yaml

@ -85,7 +85,6 @@ jobs:
run: | run: |
./mvnw -B clean deploy \ ./mvnw -B clean deploy \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \
-Dspotless.skip=true \ -Dspotless.skip=true \
-Ddocker.tag=${{ env.DOCKER_TAG }} \ -Ddocker.tag=${{ env.DOCKER_TAG }} \
-Ddocker.hub=${{ env.HUB }} \ -Ddocker.hub=${{ env.HUB }} \

1
.github/workflows/publish-nexus.yaml

@ -72,4 +72,5 @@ jobs:
-s ${{ env.SETTINGS_PATH }} \ -s ${{ env.SETTINGS_PATH }} \
-Dmaven.test.skip=true \ -Dmaven.test.skip=true \
-Dspotless.skip=true \ -Dspotless.skip=true \
-Dmaven.deploy.skip=false \
-Pstaging -Pstaging

2
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 cd dolphinscheduler
./mvnw -B clean package \ ./mvnw -B clean package \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \
-Dspotless.skip = true \ -Dspotless.skip = true \
-Ddocker.tag=<TAG> \ -Ddocker.tag=<TAG> \
-Pdocker,release -Pdocker,release
@ -78,7 +77,6 @@ When the command is finished you could find them by command `docker images`.
cd dolphinscheduler cd dolphinscheduler
./mvnw -B clean deploy \ ./mvnw -B clean deploy \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \
-Dspotless.skip = true \ -Dspotless.skip = true \
-Ddocker.tag=<TAG> \ -Ddocker.tag=<TAG> \
-Ddocker.hub=<HUB_URL> \ -Ddocker.hub=<HUB_URL> \

6
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. > first to clone the source code. And then make sure you set `GH_REMOTE="origin"` to make all command work fine.
```shell ```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. - `-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. Then, prepare to execute the release.
```shell ```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. 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 #### Maven Release Deploy
```shell ```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. After that command is executed, the version to be released will be uploaded to Apache staging repository automatically.

2
docs/docs/zh/contribute/development-environment-setup.md

@ -61,7 +61,6 @@ DolphinScheduler 每次发版都会同时发布 Docker 镜像,你可以在 [Do
cd dolphinscheduler cd dolphinscheduler
./mvnw -B clean package \ ./mvnw -B clean package \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \
-Dspotless.skip=true \ -Dspotless.skip=true \
-Ddocker.tag=<TAG> \ -Ddocker.tag=<TAG> \
-Pdocker,release -Pdocker,release
@ -75,7 +74,6 @@ cd dolphinscheduler
cd dolphinscheduler cd dolphinscheduler
./mvnw -B clean deploy \ ./mvnw -B clean deploy \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \
-Dspotless.skip = true \ -Dspotless.skip = true \
-Ddocker.tag=<TAG> \ -Ddocker.tag=<TAG> \
-Ddocker.hub=<HUB_URL> \ -Ddocker.hub=<HUB_URL> \

6
docs/docs/zh/contribute/release.md

@ -232,7 +232,7 @@ git push "${GH_REMOTE}" "${VERSION}"-release
```shell ```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 文件以及可执行二进制包。 - `-Prelease`: 选择 release 的 profile,这个 profile 会打包所有源码、jar 文件以及可执行二进制包。
@ -250,7 +250,7 @@ mvn release:clean
然后准备执行发布。 然后准备执行发布。
```shell ```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` 参数。 和上一步演练的命令基本相同,去掉了 `-DdryRun=true` 参数。
@ -279,7 +279,7 @@ git push "${GH_REMOTE}" --tags
#### 部署发布 #### 部署发布
```shell ```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) 执行完该命令后,待发布版本会自动上传到 Apache 的临时筹备仓库(staging repository)。你可以通过访问 [apache staging repositories](https://repository.apache.org/#stagingRepositories)

2
dolphinscheduler-dist/pom.xml vendored

@ -181,7 +181,7 @@
<environmentVariables> <environmentVariables>
<DOCKER_BUILDKIT>1</DOCKER_BUILDKIT> <DOCKER_BUILDKIT>1</DOCKER_BUILDKIT>
</environmentVariables> </environmentVariables>
<executable>docker</executable> <executable>bash</executable>
<workingDirectory>${project.basedir}</workingDirectory> <workingDirectory>${project.basedir}</workingDirectory>
<arguments> <arguments>
<argument>src/main/docker/docker-push.sh</argument> <argument>src/main/docker/docker-push.sh</argument>

1
pom.xml

@ -99,6 +99,7 @@
<build.plugins.skip>false</build.plugins.skip> <build.plugins.skip>false</build.plugins.skip>
<build.assembly.skip>true</build.assembly.skip> <build.assembly.skip>true</build.assembly.skip>
<spotless.skip>false</spotless.skip> <spotless.skip>false</spotless.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<skipUT>false</skipUT> <skipUT>false</skipUT>
</properties> </properties>

Loading…
Cancel
Save