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 2022/10/27 12:48:00 UTC
[hop] branch master updated: HOP-4144: fix filepath and simplify buildscript
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/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 8974b35735 HOP-4144: fix filepath and simplify buildscript
new 85e79a303f Merge pull request #1765 from hansva/master
8974b35735 is described below
commit 8974b35735b61cdd125ceb873e3072ed627d5b57
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Thu Oct 27 14:47:23 2022 +0200
HOP-4144: fix filepath and simplify buildscript
---
Jenkinsfile | 19 +++----------------
docker/Dockerfile.dataflowTemplate | 2 +-
docker/Dockerfile.web-fatjar | 2 +-
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b8899439dd..f628272df1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -154,27 +154,14 @@ pipeline {
anyOf { changeset pattern: "^(?!docs).*^(?!integration-tests).*" , comparator: "REGEXP" ; equals expected: true, actual: params.FORCE_BUILD }
}
steps {
- echo 'Building Hop Web Docker Image'
+ echo 'Building Hop Web Docker Images'
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 buildx create --name hop --use"
+ //Base docker image
sh "docker buildx build --platform linux/amd64,linux/arm64 . -f docker/Dockerfile.web -t ${DOCKER_REPO_WEB}:${env.POM_VERSION} -t ${DOCKER_REPO_WEB}:Development --push"
- sh "docker buildx rm hop"
- }
- }
- }
- stage('Build Hop Web Docker Image (Beam)') {
- when {
- branch 'master'
- anyOf { changeset pattern: "^(?!docs).*^(?!integration-tests).*" , comparator: "REGEXP" ; equals expected: true, actual: params.FORCE_BUILD }
- }
- steps {
- echo 'Building Hop Web Docker Image'
-
- 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 buildx create --name hop --use"
+ //Image including fat-jar
sh "docker buildx build --platform linux/amd64,linux/arm64 . -f docker/Dockerfile.web-fatjar -t ${DOCKER_REPO_WEB}:${env.POM_VERSION}-beam -t ${DOCKER_REPO_WEB}:Development-beam --push"
sh "docker buildx rm hop"
}
diff --git a/docker/Dockerfile.dataflowTemplate b/docker/Dockerfile.dataflowTemplate
index f7d7209a09..185f48df79 100644
--- a/docker/Dockerfile.dataflowTemplate
+++ b/docker/Dockerfile.dataflowTemplate
@@ -22,7 +22,7 @@ FROM gcr.io/dataflow-templates-base/java11-template-launcher-base
RUN mkdir -p ${WORKDIR}
WORKDIR ${WORKDIR}
- COPY ./assemblies/plugins/dist/target/hop-fatjar.jar .
+ COPY ./assemblies/client/target/hop-fatjar.jar .
ENV FLEX_TEMPLATE_JAVA_MAIN_CLASS="org.apache.hop.beam.run.MainDataflowTemplate"
ENV FLEX_TEMPLATE_JAVA_CLASSPATH="${WORKDIR}/*"
diff --git a/docker/Dockerfile.web-fatjar b/docker/Dockerfile.web-fatjar
index 1ca8fa718b..fe65ccbf90 100644
--- a/docker/Dockerfile.web-fatjar
+++ b/docker/Dockerfile.web-fatjar
@@ -45,7 +45,7 @@ COPY ./assemblies/web/target/webapp/ "${CATALINA_HOME}"/webapps/ROOT/
COPY ./assemblies/plugins/dist/target/plugins "${CATALINA_HOME}"/plugins
# Copy the fatjar to hop-web
-COPY ./assemblies/plugins/dist/target/hop-fatjar.jar /root/hop-fatjar.jar
+COPY ./assemblies/client/target/hop-fatjar.jar /root/hop-fatjar.jar
COPY ./docker/resources/run-web.sh /tmp/