Bump versions

This commit is contained in:
Patrick Jentsch 2020-04-06 09:22:04 +02:00
parent 2952a274e4
commit 053366aa09
2 changed files with 8 additions and 9 deletions

View File

@ -1,23 +1,22 @@
FROM debian:9-slim FROM debian:10-slim
# Define image metadata
LABEL maintainer="inf_sfb1288@lists.uni-bielefeld.de" LABEL maintainer="inf_sfb1288@lists.uni-bielefeld.de"
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8
# Install prerequisites
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
imagemagick \ imagemagick \
python3.5 \ python3.7 \
zip \ zip
&& rm -rf /var/lib/apt/lists/*
RUN rm -rf /var/lib/apt/lists/*
# Install merge_images
COPY file_setup /usr/local/bin COPY file_setup /usr/local/bin

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python3.5 #!/usr/bin/env python3.7
# coding=utf-8 # coding=utf-8
@ -45,7 +45,7 @@ def merge_images(input_dir, output_dir, output_file_base, zip):
cmd += ' && ' cmd += ' && '
cmd += 'zip' cmd += 'zip'
cmd += ' -m' cmd += ' -m'
cmd += ' "{}" "{}".pdf'.format(zip, output_file_base) cmd += ' "{}".zip "{}".pdf'.format(zip, output_file_base)
cmd += ' && ' cmd += ' && '
cmd += 'cd -' cmd += 'cd -'
subprocess.run(cmd, shell=True) subprocess.run(cmd, shell=True)