From 4f563705469a5a25f33f12f2b40ff26fc32929d6 Mon Sep 17 00:00:00 2001 From: cron410 Date: Wed, 1 Sep 2021 15:58:12 -0400 Subject: [PATCH 1/7] Rebase on Google Distroless - Java --- Dockerfile | 54 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index dad81cb..02d06ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,30 +1,48 @@ -FROM debian +FROM debian AS builder MAINTAINER Charles Gunzelman -LABEL org.label-schema.docker.dockerfile="/Dockerfile" \ - org.label-schema.vcs-type="Git" \ - org.label-schema.vcs-url="https://github.com/packetworks/docker-nxfilter" -ENV container docker - -# Include the SSL-Split binary, not used by default. -COPY --from=vimagick/sslsplit /usr/local/bin/sslsplit /usr/local/bin/ -RUN apt -y update \ +RUN apt -y update \ && apt -y upgrade \ - && apt -y install wget unzip default-jre-headless libtcnative-1 libapr1 libapr1-dev \ - && apt -y clean autoclean \ - && apt -y autoremove \ - && rm -rf /var/lib/apt && rm -rf /var/lib/dpkg && rm -rf /var/lib/cache && rm -rf /var/lib/log + && apt -y install wget unzip libtcnative-1 libapr1 libapr1-dev # Populate ingredients from Git repo. -COPY entrypoint.sh url.txt / +COPY url.txt / -# Download and unzip nxfilter +# Download and unzip nxfilter from nxfilter.org RUN wget -nv -i url.txt -O nxfilter.zip \ && mkdir /nxfilter \ && unzip nxfilter.zip -d /nxfilter \ - && chmod +x /nxfilter/bin/startup.sh \ && rm -f nxfilter.zip -ENTRYPOINT ["/entrypoint.sh"] -CMD ["/nxfilter/bin/startup.sh"] + +######## +######## + +FROM gcr.io/distroless/java:8 + +MAINTAINER Charles Gunzelman +LABEL org.label-schema.docker.dockerfile="/Dockerfile" \ + org.label-schema.vcs-type="Git" \ + org.label-schema.vcs-url="https://github.com/packetworks/docker-nxfilter" + +# Deconstruct startup.sh +ENV container=docker \ + PATH=$PATH:/usr/bin:/usr/local/bin \ + CLASSPATH=$NX_HOME/nxd.jar:$NX_HOME/lib/*: \ + NX_HOME=/ + +# Include SSL-Split binary, not used by default. +COPY --from=vimagick/sslsplit /usr/local/bin/sslsplit /usr/local/bin/ + +# Copy packages from Builder. +COPY --from=builder /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/ +COPY --from=builder /usr/share/lintian/overrides /usr/share/lintian/overrides +COPY --from=builder /usr/bin/apr-1-config /usr/bin/apr-config /usr/bin/ +COPY --from=builder /usr/include/apr-1.0 /usr/include/apr-1.0 +COPY --from=builder /nxfilter / +COPY --from=builder /bin/hostname /bin/ + +# Deconstruct startup.sh +ENTRYPOINT ["java"] +CMD [ "-Djava.net.preferIPv4Stack=true", "-Xmx768m", "-Djava.security.egd=file:/dev/./urandom", "nxd.Main" ] From 524ea3a028b3bf8d9ed1243c03a0f745f77edee1 Mon Sep 17 00:00:00 2001 From: cron410 Date: Wed, 1 Sep 2021 16:05:30 -0400 Subject: [PATCH 2/7] Update check_version.yml --- .github/workflows/check_version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_version.yml b/.github/workflows/check_version.yml index dfdb694..6ec147e 100644 --- a/.github/workflows/check_version.yml +++ b/.github/workflows/check_version.yml @@ -32,7 +32,7 @@ jobs: - name: Push back to branch uses: Automattic/action-commit-to-branch@master with: - branch: 'nxfilter-debian' + branch: 'nxfilter-debian-experimental' commit_message: 'GitHub Actions update version.txt' env: GITHUB_TOKEN: ${{ secrets.PAT }} From fe5a9842ab503fca5aeef4562e735c8eff50bb13 Mon Sep 17 00:00:00 2001 From: cron410 Date: Wed, 1 Sep 2021 16:06:45 -0400 Subject: [PATCH 3/7] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 71c4708..bf560da 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -39,5 +39,5 @@ jobs: file: ./Dockerfile platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm/v6,linux/arm64/v8 push: true - tags: packetworks/nxfilter-base:debian + tags: packetworks/nxfilter-base:debian-experimental labels: ${{ steps.docker_meta.outputs.labels }} From 27059bf1bc0f1a4b3fc55c793d1d9437ff0539a0 Mon Sep 17 00:00:00 2001 From: cron410 Date: Sun, 12 Sep 2021 23:51:59 -0400 Subject: [PATCH 4/7] Removed a COPY with comment --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 02d06ed..9cb4da4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ ENV container=docker \ COPY --from=vimagick/sslsplit /usr/local/bin/sslsplit /usr/local/bin/ # Copy packages from Builder. -COPY --from=builder /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/ +# COPY --from=builder /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/ #got an error with this one at build time COPY --from=builder /usr/share/lintian/overrides /usr/share/lintian/overrides COPY --from=builder /usr/bin/apr-1-config /usr/bin/apr-config /usr/bin/ COPY --from=builder /usr/include/apr-1.0 /usr/include/apr-1.0 From 03e9ca35f6afe59c6ee070adcddee71937f25c86 Mon Sep 17 00:00:00 2001 From: cron410 Date: Thu, 11 Aug 2022 14:42:45 -0400 Subject: [PATCH 5/7] Create dependabot.yml --- .github/dependabot.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b9b5496 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "monthly" From 1a6f6058954545782aad02f0ee9aaaf670a5b6d4 Mon Sep 17 00:00:00 2001 From: cron410 Date: Mon, 22 Aug 2022 11:24:15 -0400 Subject: [PATCH 6/7] Update check_version.yml --- .github/workflows/check_version.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_version.yml b/.github/workflows/check_version.yml index 6ec147e..8fb69c9 100644 --- a/.github/workflows/check_version.yml +++ b/.github/workflows/check_version.yml @@ -6,7 +6,8 @@ name: Fetch and Compare NxFilter version on: schedule: - - cron: '0 0 * * *' + - cron: '0 13 * * *' + # push: # branches: [ nxfilter-pi-experimental ] # pull_request: From 5b1cf42f9f4c71394cc1482d1932b40c0b630f05 Mon Sep 17 00:00:00 2001 From: cron410 Date: Mon, 22 Aug 2022 11:24:49 -0400 Subject: [PATCH 7/7] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9cb4da4..0198348 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ COPY url.txt / # Download and unzip nxfilter from nxfilter.org RUN wget -nv -i url.txt -O nxfilter.zip \ && mkdir /nxfilter \ - && unzip nxfilter.zip -d /nxfilter \ + && unzip -q nxfilter.zip -d /nxfilter \ && rm -f nxfilter.zip