You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2022/07/01 12:27:41 UTC
[sling-org-apache-sling-committer-cli] branch master updated: SLING-11426 - The apache/sling-cli Docker image cannot be built on M1 processors
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-committer-cli.git
The following commit(s) were added to refs/heads/master by this push:
new 3f69e4b SLING-11426 - The apache/sling-cli Docker image cannot be built on M1 processors
3f69e4b is described below
commit 3f69e4bc0490ef0ea43c3d7a5dee6c02156f4312
Author: Radu Cotescu <17...@users.noreply.github.com>
AuthorDate: Fri Jul 1 14:27:37 2022 +0200
SLING-11426 - The apache/sling-cli Docker image cannot be built on M1 processors
* updated the docker-maven-plugin to latest (0.40.1)
* switched to JDK 17 from Azul instead of Tamarin, since it provides all the architectures
a developer could use for building this image
---
Dockerfile | 3 ++-
pom.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 5e46559..4ec7f39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,8 @@
# either express or implied. See the License for the specific language governing permissions
# and limitations under the License.
# ----------------------------------------------------------------------------------------
-FROM eclipse-temurin:11-alpine as builder
+FROM azul/zulu-openjdk-alpine:17 as builder
+RUN apk add --no-cache binutils
RUN $JAVA_HOME/bin/jlink --add-modules java.logging,java.naming,java.xml,java.security.jgss,java.sql,jdk.crypto.ec,java.desktop --output /opt/jre --strip-debug --compress=2 --no-header-files --no-man-pages
FROM alpine
diff --git a/pom.xml b/pom.xml
index 5efda49..b431733 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.37.0</version>
+ <version>0.40.1</version>
<executions>
<execution>
<id>default</id>