diff --git a/.github/docker/Dockerfile_debian-bookworm b/.github/docker/Dockerfile_debian-bookworm deleted file mode 100644 index b3ee3e7..0000000 --- a/.github/docker/Dockerfile_debian-bookworm +++ /dev/null @@ -1,40 +0,0 @@ -FROM hexpm/elixir:1.15.4-erlang-26.0.2-debian-bookworm-20230612-slim - -USER root - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - chromium \ - chromium-sandbox \ - # Will install ghostscript 9.53 - ghostscript \ - # for verapdf & ZUV - openjdk-17-jre \ - # for pdftotext & friends - poppler-utils \ - # for identifying images - imagemagick \ - # for 'kill' - procps \ - # temporary for installation below - wget \ - unzip - -RUN mkdir /opt/verapdf -WORKDIR /opt/verapdf -RUN wget http://downloads.verapdf.org/rel/verapdf-installer.zip \ - && unzip verapdf-installer.zip \ - && mv verapdf-greenfield* verapdf-greenfield \ - && chmod +x verapdf-greenfield/verapdf-install -COPY .github/docker/auto-install.xml /opt/verapdf/verapdf-greenfield -RUN ./verapdf-greenfield/verapdf-install auto-install.xml - -WORKDIR /opt/zuv -RUN wget https://github.com/ZUGFeRD/ZUV/releases/download/v0.8.3/ZUV-0.8.3.jar -ENV ZUV_JAR /opt/zuv/ZUV-0.8.3.jar - -RUN apt-get remove -y \ - wget \ - unzip \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/.github/docker/Dockerfile_debian-bullseye b/.github/docker/Dockerfile_debian-bullseye deleted file mode 100644 index eb63aaf..0000000 --- a/.github/docker/Dockerfile_debian-bullseye +++ /dev/null @@ -1,40 +0,0 @@ -FROM hexpm/elixir:1.14.0-erlang-25.1-debian-bullseye-20220801 - -USER root - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - chromium \ - chromium-sandbox \ - # Will install ghostscript 9.53 - ghostscript \ - # for verapdf & ZUV - openjdk-11-jre \ - # for pdftotext & friends - poppler-utils \ - # for identifying images - imagemagick \ - # for 'kill' - procps \ - # temporary for installation below - wget \ - unzip - -RUN mkdir /opt/verapdf -WORKDIR /opt/verapdf -RUN wget http://downloads.verapdf.org/rel/verapdf-installer.zip \ - && unzip verapdf-installer.zip \ - && mv verapdf-greenfield* verapdf-greenfield \ - && chmod +x verapdf-greenfield/verapdf-install -COPY .github/docker/auto-install.xml /opt/verapdf/verapdf-greenfield -RUN ./verapdf-greenfield/verapdf-install auto-install.xml - -WORKDIR /opt/zuv -RUN wget https://github.com/ZUGFeRD/ZUV/releases/download/v0.8.3/ZUV-0.8.3.jar -ENV ZUV_JAR /opt/zuv/ZUV-0.8.3.jar - -RUN apt-get remove -y \ - wget \ - unzip \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml index 45647fe..aa78d08 100644 --- a/.github/workflows/publish-image.yml +++ b/.github/workflows/publish-image.yml @@ -11,12 +11,13 @@ name: Create and publish a Docker image to Github Packages -on: - push: - branches: ['main'] - paths: - - ".github/workflows/publish-image.yml" - - ".github/docker/*" +on: [pull_request] +#on: +# push: +# branches: ['main'] +# paths: +# - ".github/workflows/publish-image.yml" +# - ".github/docker/*" env: REGISTRY: ghcr.io @@ -31,21 +32,30 @@ jobs: packages: write strategy: matrix: - dockerfile: ['elixir-1-11', 'debian-buster', 'debian-bullseye', 'debian-bookworm', 'alpine-3-16-2', 'alpine-3-17-3', 'alpine-3-18-4'] + dockerfile: ['elixir-1-11', 'debian-buster', 'alpine-3-16-2', 'alpine-3-17-3', 'alpine-3-18-4'] steps: - name: Checkout repository uses: actions/checkout@v3 + - uses: dorny/paths-filter@v2 + id: paths-filter + with: + filters: | + dockerfile: + - .github/docker/Dockerfile_${{matrix.dockerfile}} + - name: Log in to the Container registry - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + if: steps.paths-filter.outputs.dockerfile == 'true' + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + if: steps.paths-filter.outputs.dockerfile == 'true' + uses: docker/build-push-action@v5 with: context: . file: .github/docker/Dockerfile_${{matrix.dockerfile}} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1196bd2..c4f6ff4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -5,7 +5,7 @@ jobs: name: ${{ matrix.tag }} strategy: matrix: - tag: ['elixir-1-11', 'debian-buster', 'debian-bullseye', 'debian-bookworm', 'alpine-3-16-2', 'alpine-3-17-3', 'alpine-3-18-4'] + tag: ['elixir-1-11', 'debian-buster', 'alpine-3-16-2', 'alpine-3-17-3', 'alpine-3-18-4'] env: MIX_ENV: test runs-on: ubuntu-latest diff --git a/README.md b/README.md index 08ed535..df8339d 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,6 @@ ChromicPDF is tested in the following configurations: | 1.15.7 | 26.2 | Alpine 3.18 | 119.0.6045.159 | 10.02.0 | | 1.14.5 | 25.3.1 | Alpine 3.17 | 112.0.5615.165 | 10.01.1 | | 1.14.0 | 25.1 | Alpine 3.16 | 102.0.5005.182 | 9.56.1 | -| 1.15.4 | 26.0.2 | Debian Bookworm | 115.0.5790.170 | 10.00.0 | -| 1.14.0 | 25.1 | Debian Bullseye | 108.0.5359.94 | 9.53.3 | | 1.14.0 | 25.1 | Debian Buster | 90.0.4430.212-1 | 9.27 | | 1.11.4 | 22.3.4.26 | Debian Buster | 90.0.4430.212-1 | 9.27 |