This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch issue/SLING-11426
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-committer-cli.git
commit 699fba5027b3f97f79e374a2dca47260b088bee5
Author: Radu Cotescu <r...@apache.org>
AuthorDate: Wed Jun 29 10:54:43 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
---
Dockerfile | 5 +++--
pom.xml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ea306fa..aee4f80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,9 +9,10 @@
# either express or implied. See the License for the specific language
governing permissions
# and limitations under the License.
#
----------------------------------------------------------------------------------------
-FROM azul/zulu-openjdk-alpine:11 as builder
+FROM azul/zulu-openjdk-alpine:17 as builder
MAINTAINER d...@sling.apache.org
-RUN /usr/lib/jvm/zulu11-ca/bin/jlink --add-modules
java.logging,java.naming,java.xml,java.security.jgss,java.sql,jdk.crypto.ec,java.desktop
\
+RUN apk add --no-cache binutils
+RUN /usr/lib/jvm/default-jvm/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 0e6ed4f..5780cea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,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>
