mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/file-setup.git
synced 2024-12-27 03:44:19 +00:00
Bump versions
This commit is contained in:
parent
2952a274e4
commit
053366aa09
13
Dockerfile
13
Dockerfile
@ -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
|
||||||
|
|
||||||
|
|
||||||
|
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user