From 6ddfbe959e83e4d9c8e298029ccf309e8dbeffad Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 19 Dec 2024 14:22:22 +0100 Subject: [PATCH] ci(docker/backend): prepare Dockerfiles for separate image artifact push step --- docker/backend/Dockerfile | 16 +--------------- docker/haskell/Dockerfile | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 docker/haskell/Dockerfile diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 91c7d301a..6d7ecacf0 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -1,18 +1,4 @@ -FROM devfra.azurecr.io/de.fraport.build/haskell:8.10.4 - -ENV LANG=de_DE.UTF-8 - -# compile-time dependencies -RUN apt-get -y update && apt-get install -y libpq-dev libsodium-dev -# RUN apt-get -y update && apt-get -y install llvm -# RUN apt-get -y update && apt-get -y install g++ libghc-zlib-dev libpq-dev libsodium-dev pkg-config -# RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata -RUN apt-get -y update && apt-get install -y --no-install-recommends locales locales-all - -# run-time dependencies for uniworx binary -RUN apt-get -y update && apt-get -y install fonts-roboto -# RUN apt-get -y update && apt-get -y install pdftk -RUN apt-get -y update && apt-get -y install texlive-latex-recommended texlive-luatex texlive-plain-generic texlive-lang-german texlive-lang-english +FROM fradrive/backend:8.10.4 # locally these two should be identical, so that compilation results are written out into the file dir. # in CI-pipelines these two should be different, so that the container caches the compilation results. diff --git a/docker/haskell/Dockerfile b/docker/haskell/Dockerfile new file mode 100644 index 000000000..301a262fa --- /dev/null +++ b/docker/haskell/Dockerfile @@ -0,0 +1,17 @@ +FROM devfra.azurecr.io/de.fraport.build/haskell:8.10.4 + +USER root + +# ENV LANG=de_DE.UTF-8 + +# compile-time dependencies +RUN apt-get -y update && apt-get install -y libpq-dev libsodium-dev +# RUN apt-get -y update && apt-get -y install llvm +# RUN apt-get -y update && apt-get -y install g++ libghc-zlib-dev libpq-dev libsodium-dev pkg-config +# RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata +RUN apt-get -y update && apt-get install -y --no-install-recommends locales locales-all + +# run-time dependencies for uniworx binary +RUN apt-get -y update && apt-get -y install fonts-roboto +# RUN apt-get -y update && apt-get -y install pdftk +RUN apt-get -y update && apt-get -y install texlive-latex-recommended texlive-luatex texlive-plain-generic texlive-lang-german texlive-lang-english \ No newline at end of file