From ac4daeb82c79f37f989f5ff400e4801ceb3f7a3e Mon Sep 17 00:00:00 2001
From: Jean-Luc <jeanluc1@live.de>
Date: Sat, 28 Jan 2023 15:47:09 +0100
Subject: [PATCH 1/2] changed baseimage to allow for multiarch build
 (specifically arm64)

---
 Dockerfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7d885ca909..f4fedaea56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,25 @@
-FROM jlesage/baseimage:alpine-3.15-glibc as builder
+FROM alpine:latest as builder
 
 ENV APP_HOME="/i2p"
 
 WORKDIR /tmp/build
 COPY . .
 
-RUN add-pkg --virtual build-base gettext tar bzip2 apache-ant openjdk17 \
+RUN apk add --virtual build-base gettext tar bzip2 apache-ant openjdk17 \
     && ant preppkg-linux-only \
     && rm -rf pkg-temp/osid pkg-temp/lib/wrapper pkg-temp/lib/wrapper.* \
-    && del-pkg build-base gettext tar bzip2 apache-ant openjdk17
+    && apk del build-base gettext tar bzip2 apache-ant openjdk17
 
-FROM jlesage/baseimage:alpine-3.15-glibc
+FROM alpine:latest
 ENV APP_HOME="/i2p"
 
-RUN add-pkg openjdk17-jre
+RUN apk add openjdk17-jre
 WORKDIR ${APP_HOME}
 COPY --from=builder /tmp/build/pkg-temp .
 
 # "install" i2p by copying over installed files
-COPY docker/rootfs/ /
+COPY --chown=root:root docker/rootfs/ /
+RUN chmod +x /startapp.sh
 
 # Mount home and snark
 VOLUME ["${APP_HOME}/.i2p"]
@@ -34,3 +35,4 @@ LABEL \
       org.label-schema.vcs-url="https://github.com/i2p/i2p.i2p" \
       org.label-schema.schema-version="1.0"
 
+ENTRYPOINT ["/startapp.sh"]

From cc00337ec15063a5b6cc1957ff1e33527d7c3028 Mon Sep 17 00:00:00 2001
From: Jean-Luc <jeanluc1@live.de>
Date: Sun, 29 Jan 2023 14:02:54 +0100
Subject: [PATCH 2/2] pinned alpine base image version

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 31da41399d..a101002ed1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest as builder
+FROM alpine:3.17.1 as builder
 
 ENV APP_HOME="/i2p"
 
@@ -12,7 +12,7 @@ RUN apk add --virtual build-base gettext tar bzip2 apache-ant openjdk17 \
     && rm -rf pkg-temp/osid pkg-temp/lib/wrapper pkg-temp/lib/wrapper.* \
     && apk del build-base gettext tar bzip2 apache-ant openjdk17
 
-FROM alpine:latest
+FROM alpine:3.17.1
 ENV APP_HOME="/i2p"
 
 RUN apk add openjdk17-jre ttf-dejavu