You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/08/10 10:32:45 UTC

[incubator-hop] branch master updated: HOP-3169: add ARM build for docker web

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 57fb27b  HOP-3169: add ARM build for docker web
     new d5d0d0b  Merge pull request #989 from hansva/master
57fb27b is described below

commit 57fb27b46b61453880b2b3e08a2042ade2ce8520
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Tue Aug 10 12:11:10 2021 +0200

    HOP-3169: add ARM build for docker web
    
    
    add rmi
---
 Jenkinsfile                                                        | 3 +--
 .../modules/ROOT/pages/apache-release/promoting-a-release.adoc     | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7319cfe..8589f54 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -147,8 +147,7 @@ pipeline {
 
                 withDockerRegistry([ credentialsId: "dockerhub-hop", url: "" ]) {
                     //TODO We may never create final/latest version using CI/CD as we need to follow manual apache release process with signing
-                    sh "docker build . -f docker/Dockerfile.web -t ${DOCKER_REPO_WEB}:${env.POM_VERSION}"
-                    sh "docker push ${DOCKER_REPO_WEB}:${env.POM_VERSION}"
+                    sh "docker buildx build --platform linux/amd64,linux/arm64 . -f docker/Dockerfile.web -t ${DOCKER_REPO_WEB}:${env.POM_VERSION} --push"
                     sh "docker rmi ${DOCKER_REPO_WEB}:${env.POM_VERSION}"
                   }
             }
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc
index f644e93..bb7a686 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc
@@ -88,10 +88,7 @@ docker build . -f docker/Dockerfile -t docker.io/apache/incubator-hop:X.XX -t do
 # Push to dockerhub
 docker image push --all-tags docker.io/apache/incubator-hop
 
-# Create Hop Web
-docker build . -f docker/Dockerfile.web -t docker.io/apache/incubator-hop-web:X.XX -t docker.io/apache/incubator-hop-web:latest
-
-# Push to dockerhub
-docker image push --all-tags docker.io/apache/incubator-hop-web
+# Create and push Hop Web
+docker buildx build --platform linux/amd64,linux/arm64 . -f docker/Dockerfile.web -t docker.io/apache/incubator-hop-web:X.XX -t docker.io/apache/incubator-hop-web:latest --push
 
 ----
\ No newline at end of file