From 053366aa097f1538ee82f55bb9985cce1d0aaf81 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 6 Apr 2020 09:22:04 +0200 Subject: [PATCH] Bump versions --- Dockerfile | 13 ++++++------- file_setup | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index c1ef419..24e091d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,22 @@ -FROM debian:9-slim +FROM debian:10-slim -# Define image metadata LABEL maintainer="inf_sfb1288@lists.uni-bielefeld.de" ENV LANG=C.UTF-8 -# Install prerequisites RUN apt-get update \ && apt-get install -y --no-install-recommends \ imagemagick \ - python3.5 \ - zip \ - && rm -rf /var/lib/apt/lists/* + python3.7 \ + zip + + +RUN rm -rf /var/lib/apt/lists/* -# Install merge_images COPY file_setup /usr/local/bin diff --git a/file_setup b/file_setup index 93e0d6c..4554b74 100755 --- a/file_setup +++ b/file_setup @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.5 +#!/usr/bin/env python3.7 # coding=utf-8 @@ -45,7 +45,7 @@ def merge_images(input_dir, output_dir, output_file_base, zip): cmd += ' && ' cmd += 'zip' cmd += ' -m' - cmd += ' "{}" "{}".pdf'.format(zip, output_file_base) + cmd += ' "{}".zip "{}".pdf'.format(zip, output_file_base) cmd += ' && ' cmd += 'cd -' subprocess.run(cmd, shell=True)