From 3a94f4bbd016e21c1b103a9a80bba35c43c7c11b Mon Sep 17 00:00:00 2001 From: Ivan Subotic <400790+subotic@users.noreply.github.com> Date: Fri, 24 Sep 2021 11:36:05 +0200 Subject: [PATCH 1/3] build: update to sipi base image with ffmpeg --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 610904a3..9abb87c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # STAGE 1: Build -FROM dhlabbasel/sipi-base:18.04 as builder +FROM daschswiss/sipi-base:2.4 as builder WORKDIR /sipi @@ -13,7 +13,7 @@ RUN mkdir -p /sipi/build-linux && \ make # STAGE 2: Setup -FROM dhlabbasel/sipi-base:18.04 +FROM daschswiss/sipi-base:2.4 MAINTAINER Ivan Subotic <400790+subotic@users.noreply.github.com> From 9aa847b62d06d507e3f15f10f67e61f0f7921cb7 Mon Sep 17 00:00:00 2001 From: Ivan Subotic <400790+subotic@users.noreply.github.com> Date: Sun, 26 Sep 2021 08:07:35 +0200 Subject: [PATCH 2/3] build: update to sipi base image with ffmpeg --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cd165ccf..08936d6a 100644 --- a/Makefile +++ b/Makefile @@ -33,21 +33,21 @@ publish-sipi-image: build-sipi-image ## publish Sipi Docker image to Docker-Hub .PHONY: compile compile: ## compile SIPI inside Docker - docker run -it --rm -v ${PWD}:/sipi dhlabbasel/sipi-base:18.04 /bin/sh -c "mkdir -p /sipi/build-linux && cd /sipi/build-linux && cmake .. && make" + docker run -it --rm -v ${PWD}:/sipi daschswiss/sipi-base:2.4 /bin/sh -c "mkdir -p /sipi/build-linux && cd /sipi/build-linux && cmake .. && make" .PHONY: compile-ci compile-ci: ## compile SIPI inside Docker (no it) - docker run --rm -v ${PWD}:/sipi dhlabbasel/sipi-base:18.04 /bin/sh -c "mkdir -p /sipi/build-linux && cd /sipi/build-linux && cmake .. && make" + docker run --rm -v ${PWD}:/sipi daschswiss/sipi-base:2.4 /bin/sh -c "mkdir -p /sipi/build-linux && cd /sipi/build-linux && cmake .. && make" .PHONY: test test: ## compile and run tests inside Docker @mkdir -p ${PWD}/images - docker run -it --rm -v ${PWD}:/sipi dhlabbasel/sipi-base:18.04 /bin/sh -c "mkdir -p /sipi/build-linux && cd /sipi/build-linux && cmake .. && make && ctest --verbose" + docker run -it --rm -v ${PWD}:/sipi daschswiss/sipi-base:2.4 /bin/sh -c "mkdir -p /sipi/build-linux && cd /sipi/build-linux && cmake .. && make && ctest --verbose" .PHONY: test-ci test-ci: ## compile and run tests inside Docker (no it) @mkdir -p ${CURRENT_DIR}/images - docker run --rm -v ${PWD}:/sipi dhlabbasel/sipi-base:18.04 /bin/sh -c "mkdir -p /sipi/build-linux && cd /sipi/build-linux && cmake .. && make && ctest --verbose" + docker run --rm -v ${PWD}:/sipi daschswiss/sipi-base:2.4 /bin/sh -c "mkdir -p /sipi/build-linux && cd /sipi/build-linux && cmake .. && make && ctest --verbose" .PHONY: test-integration test-integration: build-sipi-image ## run tests against locally published Sipi Docker image From 2203122f2b2c6bc774fd30864da6112f7b350bac Mon Sep 17 00:00:00 2001 From: irinaschubert Date: Tue, 5 Oct 2021 18:09:54 +0200 Subject: [PATCH 3/3] Change mimetype to application/csv --- test/_test_data/scripts/test_mimetype_func.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/_test_data/scripts/test_mimetype_func.lua b/test/_test_data/scripts/test_mimetype_func.lua index 1bc6d305..e651564f 100644 --- a/test/_test_data/scripts/test_mimetype_func.lua +++ b/test/_test_data/scripts/test_mimetype_func.lua @@ -31,7 +31,7 @@ local test_files = { }, { filename = 'test.csv', - expected_mimetype = "text/plain" + expected_mimetype = "application/csv" } }