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/01/31 16:11:41 UTC
[hop] branch master updated: HOP-3708: add arm support to hop image
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 e9a86fd HOP-3708: add arm support to hop image
new df840b3 Merge pull request #1313 from hansva/master
e9a86fd is described below
commit e9a86fde56b92700102d85d1085f2d64affaf855
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Mon Jan 31 17:05:20 2022 +0100
HOP-3708: add arm support to hop image
---
Jenkinsfile | 7 +++----
docker/Dockerfile | 5 +++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8fa0923..7b91a9e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -131,10 +131,9 @@ 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 -t ${DOCKER_REPO}:${env.POM_VERSION} -t ${DOCKER_REPO}:Development"
- sh "docker push --all-tags ${DOCKER_REPO}"
- sh "docker rmi ${DOCKER_REPO}:Development"
- sh "docker rmi ${DOCKER_REPO}:${env.POM_VERSION}"
+ sh "docker buildx create --name hop --use"
+ sh "docker buildx build --platform linux/amd64,linux/arm64 . -f docker/Dockerfile -t ${DOCKER_REPO}:${env.POM_VERSION} -t ${DOCKER_REPO}:Development --push"
+ sh "docker buildx rm hop"
}
}
}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3100e40..292e3b7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM adoptopenjdk/openjdk8:alpine-slim
+FROM alpine
LABEL maintainer="Apache Hop Team"
# path to where the artifacts should be deployed to
ENV DEPLOYMENT_PATH=/opt/hop
@@ -87,7 +87,8 @@ ENV HOP_SERVER_MAX_OBJECT_TIMEOUT=
RUN chmod 777 -R /tmp && chmod o+t -R /tmp
# Install some fonts
-RUN apk --no-cache add msttcorefonts-installer \
+RUN apk --no-cache add openjdk8-jre \
+ msttcorefonts-installer \
fontconfig \
font-noto \
font-noto-adlam \