Skip to content

Commit 6e51555

Browse files
authored
Upgrading base container to bullseye-slim. (#141)
1 parent 57de3cd commit 6e51555

File tree

1 file changed

+8
-21
lines changed

1 file changed

+8
-21
lines changed

docker-images/base/Dockerfile

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:buster as unison
1+
FROM debian:bullseye-slim as unison
22
RUN \
33
set -x && \
44
export DEBIAN_FRONTEND=noninteractive && \
@@ -9,12 +9,12 @@ RUN \
99
wget \
1010
ocaml-native-compilers && \
1111
cd /tmp/ && \
12-
wget https://github.com/bcpierce00/unison/archive/v2.51.2.tar.gz && \
13-
tar -xzvf v2.51.2.tar.gz && \
14-
cd /tmp/unison-2.51.2 && \
12+
wget https://github.com/bcpierce00/unison/archive/v2.53.3.tar.gz && \
13+
tar -xzvf v2.53.3.tar.gz && \
14+
cd /tmp/unison-2.53.3 && \
1515
make
1616

17-
FROM debian:buster
17+
FROM debian:bullseye-slim
1818

1919
RUN \
2020
set -x && \
@@ -54,19 +54,6 @@ RUN \
5454
/var/log/* \
5555
/tmp/*
5656

57-
# Temp workaround bug in system.d with kernel 5.8
58-
RUN \
59-
echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list && \
60-
set -x && \
61-
export DEBIAN_FRONTEND=noninteractive && \
62-
apt-get update && \
63-
apt-get -y -o Dpkg::Options::="--force-confnew" -t=buster-backports upgrade systemd && \
64-
apt-get clean && \
65-
rm -rf \
66-
/var/lib/apt/lists/* \
67-
/var/log/* \
68-
/tmp/*
69-
7057
RUN \
7158
echo 'UseDNS no' >> /etc/ssh/sshd_config && \
7259
mkdir -p /var/run/sshd && \
@@ -89,16 +76,16 @@ RUN \
8976
/etc/machine-id \
9077
/var/lib/dbus/machine-id
9178

92-
COPY --from=unison /tmp/unison-2.51.2/src/unison /usr/local/bin/
93-
COPY --from=unison /tmp/unison-2.51.2/src/unison-fsmonitor /usr/local/bin/
79+
COPY --from=unison /tmp/unison-2.53.3/src/unison /usr/local/bin/
80+
COPY --from=unison /tmp/unison-2.53.3/src/unison-fsmonitor /usr/local/bin/
9481
COPY ./ce-dev-ownership.sh /opt/
9582
COPY ./ce-dev-ssh.sh /opt/
9683
COPY ./unison.sh /opt/
9784
COPY ./unison-startup.sh /opt/
9885
COPY ./procmailrc /etc/procmailrc
9986

10087
RUN \
101-
wget https://github.com/FiloSottile/mkcert/releases/download/v1.4.1/mkcert-v1.4.1-linux-amd64 -O /usr/local/bin/mkcert && \
88+
wget https://github.com/FiloSottile/mkcert/releases/download/v1.4.4/mkcert-v1.4.4-linux-amd64 -O /usr/local/bin/mkcert && \
10289
mkdir -p /home/ce-dev/deploy/live.local /home/ce-dev/.composer/cache /home/ce-dev/.nvm/versions/node /home/ce-dev/.local/share/mkcert && \
10390
chown -R ce-dev:ce-dev /home/ce-dev && \
10491
chmod +x /usr/local/bin/*

0 commit comments

Comments
 (0)