Skip to content

Commit

Permalink
Merge pull request #38 from jeanluc162/docker-multiarch
Browse files Browse the repository at this point in the history
Changed baseimage to allow for multiarch build (specifically arm64)
  • Loading branch information
eyedeekay authored Feb 22, 2023
2 parents 37feda7 + cc00337 commit 9369002
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
FROM jlesage/baseimage:alpine-3.15-glibc as builder
FROM alpine:3.17.1 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 \
&& echo "build.built-by=Docker" >> override.properties \

&& 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:3.17.1
ENV APP_HOME="/i2p"

RUN add-pkg openjdk17-jre ttf-dejavu
RUN apk add openjdk17-jre ttf-dejavu

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"]
Expand All @@ -35,3 +38,4 @@ LABEL \
org.label-schema.vcs-url="https://github.com/i2p/i2p.i2p" \
org.label-schema.schema-version="1.0"

ENTRYPOINT ["/startapp.sh"]

0 comments on commit 9369002

Please sign in to comment.