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 20:03:18 UTC
[hop] branch master updated: HOP-3708: try to fix arm build
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 8087785 HOP-3708: try to fix arm build
new 6a97ce1 Merge pull request #1314 from hansva/master
8087785 is described below
commit 80877857b41580880950aca5f76b24cbf195889d
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Mon Jan 31 21:02:50 2022 +0100
HOP-3708: try to fix arm build
---
Jenkinsfile | 4 +++-
docker/Dockerfile | 18 +++---------------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7b91a9e..394fa51 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -132,7 +132,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 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 build --platform linux/amd64,linux/arm64 . -f docker/Dockerfile -t ${DOCKER_REPO}:${env.POM_VERSION} -t ${DOCKER_REPO}:Development --push"
+ //build only arm for test
+ sh "docker buildx build --platform 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 292e3b7..6950e65 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -89,21 +89,9 @@ RUN chmod 777 -R /tmp && chmod o+t -R /tmp
# Install some fonts
RUN apk --no-cache add openjdk8-jre \
msttcorefonts-installer \
- fontconfig \
- font-noto \
- font-noto-adlam \
- font-noto-adlamunjoined \
- font-noto-arabic \
- font-noto-armenian \
- font-noto-avestan \
- font-noto-bamum \
- font-noto-bengali \
- font-noto-buhid \
- font-noto-carian \
- font-noto-chakma \
- font-noto-cherokee && \
- update-ms-fonts && \
- fc-cache -f
+ fontconfig && \
+ update-ms-fonts && \
+ fc-cache -f
# INSTALL REQUIRED PACKAGES AND ADJUST LOCALE
# procps: The package includes the programs ps, top, vmstat, w, kill, free, slabtop, and skill