gavin/labelmaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'trunk' of https://gitea.mcmorgans.us/gavin/labelmaker into trunk

Browse Source
This commit is contained in:
Gavin McDonald
2025-05-17 16:16:55 -04:00
parent 4f554e9c07 27f7566820
commit 41f1499d40
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@@ -21,8 +21,11 @@ ARG RUNNER_IMAGE="debian:${DEBIAN_VERSION}"
FROM ${BUILDER_IMAGE} AS builder FROM ${BUILDER_IMAGE} AS builder
# install build dependencies # install build dependencies
RUN apt-get update -y && apt-get install -y build-essential git imagemagick ttf-mscorefonts-installer \ RUN sed -i 's/main/main contrib non-free/g' /etc/apt/sources.list && \
&& apt-get clean && rm -f /var/lib/apt/lists/*_* apt-get update -y && \
apt-get install -y build-essential git imagemagick ttf-mscorefonts-installer && \
apt-get clean && \
rm -f /var/lib/apt/lists/*_*
# Debian version still uses 'convert' # Debian version still uses 'convert'
RUN ln -s $(which convert) /usr/local/bin/magick RUN ln -s $(which convert) /usr/local/bin/magick
@@ -70,9 +73,11 @@ RUN mix release
# the compiled release and other runtime necessities # the compiled release and other runtime necessities
FROM ${RUNNER_IMAGE} FROM ${RUNNER_IMAGE}
RUN apt-get update -y && \ RUN sed -i 's/main/main contrib non-free/g' /etc/apt/sources.list && \
apt-get install -y libstdc++6 openssl libncurses5 locales ca-certificates imagemagick ttf-mscorefonts-installer \ apt-get update -y && \
&& apt-get clean && rm -f /var/lib/apt/lists/*_* apt-get install -y libstdc++6 openssl libncurses5 locales ca-certificates imagemagick ttf-mscorefonts-installer && \
apt-get clean && \
rm -f /var/lib/apt/lists/*_*
# Debian version still uses 'convert' # Debian version still uses 'convert'
RUN ln -s $(which convert) /usr/local/bin/magick RUN ln -s $(which convert) /usr/local/bin/magick