projects
/
citadel-docker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2388e3f
)
Switched from bitnami minideb to debian-slim, because the former is not available...
author
Art Cancro
<ajc@citadel.org>
Sat, 21 Aug 2021 21:30:04 +0000
(17:30 -0400)
committer
Art Cancro
<ajc@citadel.org>
Sat, 21 Aug 2021 21:30:04 +0000
(17:30 -0400)
Dockerfile
patch
|
blob
|
history
diff --git
a/Dockerfile
b/Dockerfile
index 3a62e8d2e619fd6fda5a7d2f236f1e85f54cdae1..ad5ee2b46ba5a9edae4d1b43f06eb5c34e3e0b71 100644
(file)
--- a/
Dockerfile
+++ b/
Dockerfile
@@
-2,13
+2,15
@@
# This container is built on MiniDeb, a stripped down version of Debian for use in containers.
# Rehosting on another base Linux image is not expected to create compatibility issues.
# This container is built on MiniDeb, a stripped down version of Debian for use in containers.
# Rehosting on another base Linux image is not expected to create compatibility issues.
-FROM
bitnami/minideb:latest
+FROM
debian:11-slim
# All long term persistent data goes here. Any volume driver may be used.
VOLUME /citadel-data
# All long term persistent data goes here. Any volume driver may be used.
VOLUME /citadel-data
+RUN apt -y update
+
# Install prerequisites
# Install prerequisites
-RUN
install_packages
gcc bison make zlib1g-dev libldap2-dev libssl-dev gettext libical-dev libexpat1-dev curl libcurl4-openssl-dev git autoconf automake netbase libreadline-dev
+RUN
apt -y install
gcc bison make zlib1g-dev libldap2-dev libssl-dev gettext libical-dev libexpat1-dev curl libcurl4-openssl-dev git autoconf automake netbase libreadline-dev
# Build our own local copy of Berkeley DB, because the one included with the system libs is too old.
RUN sh -c 'mkdir /tmp/db_build && \
# Build our own local copy of Berkeley DB, because the one included with the system libs is too old.
RUN sh -c 'mkdir /tmp/db_build && \
@@
-29,7
+31,7
@@
RUN sh -c 'export CFLAGS=-I/usr/local/ctdlsupport/include && \
export LDFLAGS="-L/usr/local/ctdlsupport/lib -Wl,--rpath -Wl,/usr/local/ctdlsupport/lib" && \
mkdir /tmp/ctdl_build && \
cd /tmp/ctdl_build && \
export LDFLAGS="-L/usr/local/ctdlsupport/lib -Wl,--rpath -Wl,/usr/local/ctdlsupport/lib" && \
mkdir /tmp/ctdl_build && \
cd /tmp/ctdl_build && \
- git clone git://git.citadel.org/
appl/gitroot/citadel.git
&& \
+ git clone git://git.citadel.org/
citadel
&& \
cd /tmp/ctdl_build/citadel/libcitadel && \
./bootstrap && \
./configure --prefix=/usr && \
cd /tmp/ctdl_build/citadel/libcitadel && \
./bootstrap && \
./configure --prefix=/usr && \