From 89a406efd5911df67f2da1e296a1d7122991b8ea Mon Sep 17 00:00:00 2001 From: Erno Kuusela Date: Sun, 19 Feb 2023 10:04:10 +0200 Subject: [PATCH 1/2] Bump Ubuntu version --- docker-build/Dockerfile.laundry-programs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-build/Dockerfile.laundry-programs b/docker-build/Dockerfile.laundry-programs index 268acb0..e55da2c 100644 --- a/docker-build/Dockerfile.laundry-programs +++ b/docker-build/Dockerfile.laundry-programs @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:22.04 RUN apt-get update && apt-get -y upgrade && apt-get -y install \ ghostscript \ imagemagick \ From 22bda97f4b56280187ec5a5b5a4e9b0b34de7782 Mon Sep 17 00:00:00 2001 From: Erno Kuusela Date: Sun, 19 Feb 2023 10:13:35 +0200 Subject: [PATCH 2/2] Adapt test to getting PDF-1.6 output with newer Ghostscript --- test/laundry/docx_test.clj | 2 +- test/laundry/xlsx_test.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/laundry/docx_test.clj b/test/laundry/docx_test.clj index 9315586..dce2a88 100644 --- a/test/laundry/docx_test.clj +++ b/test/laundry/docx_test.clj @@ -16,4 +16,4 @@ response (app request) body (ring.util.request/body-string response)] (is (= 200 (:status response))) - (is (clojure.string/starts-with? body "%PDF-1.4")))) + (is (clojure.string/starts-with? body "%PDF-1.")))) diff --git a/test/laundry/xlsx_test.clj b/test/laundry/xlsx_test.clj index 531a3ec..3978227 100644 --- a/test/laundry/xlsx_test.clj +++ b/test/laundry/xlsx_test.clj @@ -16,4 +16,4 @@ response (app request) body (ring.util.request/body-string response)] (is (= 200 (:status response))) - (is (clojure.string/starts-with? body "%PDF-1.4")))) + (is (clojure.string/starts-with? body "%PDF-1."))))