Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): add bc and imagemagick (DEV-702) #372

Merged
merged 2 commits into from
Apr 1, 2022
Merged

chore(deps): add bc and imagemagick (DEV-702) #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2049ecf
chore(deps): add bc and imagemagick (DEV-702)
kilchenmann Mar 29, 2022
9c14eb5
chore(deps): bump zlib to latest
kilchenmann Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/ccache \
# STAGE 2: Setup debug
FROM $UBUNTU_BASE as debug

MAINTAINER Ivan Subotic <400790+subotic@users.noreply.github.com>
LABEL maintainer="400790+subotic@users.noreply.github.com"

# Silence debconf messages
ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -69,6 +69,8 @@ RUN sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
uuid \
ffmpeg \
at \
bc \
imagemagick \
valgrind

# add locales
Expand Down Expand Up @@ -99,7 +101,7 @@ CMD ["--config=/sipi/config/sipi.config.lua"]
# STAGE 2: Setup production
FROM $UBUNTU_BASE as production

MAINTAINER Ivan Subotic <400790+subotic@users.noreply.github.com>
LABEL maintainer="400790+subotic@users.noreply.github.com"

# Silence debconf messages
ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -123,7 +125,9 @@ RUN sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
locales \
uuid \
ffmpeg \
at
at \
bc \
imagemagick

# add locales
RUN locale-gen en_US.UTF-8 && \
Expand Down
6 changes: 3 additions & 3 deletions ext/zlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ include(ExternalProject)
#
ExternalProject_Add(project_zlib
INSTALL_DIR ${COMMON_LOCAL}
URL http://zlib.net/zlib-1.2.11.tar.gz
SOURCE_DIR ${COMMON_SRCS}/zlib-1.2.11
CONFIGURE_COMMAND ${COMMON_SRCS}/zlib-1.2.11/configure
URL http://zlib.net/zlib-1.2.12.tar.gz
SOURCE_DIR ${COMMON_SRCS}/zlib-1.2.12
CONFIGURE_COMMAND ${COMMON_SRCS}/zlib-1.2.12/configure
--prefix=${COMMON_LOCAL}
--static
# --shared
Expand Down