You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/08/24 14:55:14 UTC
[incubator-linkis] branch dev-1.3.0 updated: [ISSUE-2968]fix docker build git action (#2969)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new 03c5bf139 [ISSUE-2968]fix docker build git action (#2969)
03c5bf139 is described below
commit 03c5bf139ca5cab14ea19a8fa93368c5fe42a166
Author: aiceflower <ki...@sina.com>
AuthorDate: Wed Aug 24 22:55:07 2022 +0800
[ISSUE-2968]fix docker build git action (#2969)
* Resolve the action execution failure
* change linkis-web dir
---
.github/workflows/publish-docker.yaml | 11 +++++------
linkis-dist/pom.xml | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 6d28cff60..a52208031 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -17,9 +17,9 @@
name: publish-docker
on:
- create:
+ push:
branches:
- - release-**
+ - dev-1.3.0
jobs:
publish-docker:
runs-on: ubuntu-latest
@@ -35,8 +35,6 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- - id: commit
- uses: pr-mpt/actions-commit-hash@v1
- name: Set up JDK 8
uses: actions/setup-java@v2
with:
@@ -59,7 +57,7 @@ jobs:
uses: docker/setup-buildx-action@v1
- name: Build frontend by node.js
run: |
- cd web
+ cd linkis-web
sed -i "/VUE_APP_MN_CONFIG_PREFIX/d" .env
npm install
npm run build
@@ -77,8 +75,9 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Push Docker Image
env:
- DOCKER_VERSION: ${{ github.ref_name }}-${{ steps.commit.outputs.short }}
+ DOCKER_VERSION: ${{ github.ref_name }}-${{ github.sha }}
run: |
+ docker images
docker tag linkis:${{ env.LINKIS_VERSION }} ${{ env.HUB }}/library/linkis:${{ env.DOCKER_VERSION }}
docker push ${{ env.HUB }}/library/linkis:${{ env.DOCKER_VERSION }}
docker tag linkis-web:${{ env.LINKIS_VERSION }} ${{ env.HUB }}/library/linkis-web:${{ env.DOCKER_VERSION }}
diff --git a/linkis-dist/pom.xml b/linkis-dist/pom.xml
index b5f4f94b8..09e704b33 100644
--- a/linkis-dist/pom.xml
+++ b/linkis-dist/pom.xml
@@ -285,7 +285,7 @@
<echo message="Building linkis web image ..."></echo>
<mkdir dir="${basedir}/target/apache-linkis-web-${project.version}-dist"></mkdir>
<copy todir="${basedir}/target/apache-linkis-web-${project.version}-dist">
- <fileset dir="${basedir}/../web/dist" includes="**"></fileset>
+ <fileset dir="${basedir}/../linkis-web/dist" includes="**"></fileset>
</copy>
<exec executable="docker" failonerror="true">
<arg value="build"></arg>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org