Skip to content

Commit 119bbbb

Browse files
committed
Update Slack to Debian Trixie
1 parent dbf8904 commit 119bbbb

File tree

2 files changed

+22
-28
lines changed

2 files changed

+22
-28
lines changed

slack/Dockerfile

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM debian:bookworm-slim
7+
FROM debian:trixie-slim
88

99
RUN set -eux; \
10-
apt-get update; \
11-
apt-get install -y --no-install-recommends \
10+
apt-get install --update -y --no-install-recommends \
1211
ca-certificates \
1312
# used as a fake browser so clicked URLs (and internal Slack behavior that wants to open a browser) pop up with a URL + clipboard instead of silently doing nothing
1413
zenity xclip \
1514
; \
16-
rm -rf /var/lib/apt/lists/*
15+
apt-get dist-clean
1716

1817
ENV LANG C.UTF-8
1918

@@ -28,30 +27,28 @@ ENV SLACK_GPG_KEY DB085A08CA13B8ACB917E0F6D938EC0D038651BD
2827
RUN set -eux; \
2928
\
3029
savedAptMark="$(apt-mark showmanual)"; \
31-
apt-get update; \
32-
apt-get install -y --no-install-recommends \
30+
apt-get install --update -y --no-install-recommends \
3331
gnupg \
3432
; \
35-
rm -rf /var/lib/apt/lists; \
3633
\
3734
export GNUPGHOME="$(mktemp -d)"; \
3835
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$SLACK_GPG_KEY"; \
39-
gpg --batch --export --armor "$SLACK_GPG_KEY" > /etc/apt/trusted.gpg.d/slack.gpg.asc; \
36+
gpg --batch --export --armor "$SLACK_GPG_KEY" > /etc/apt/keyrings/slack.asc; \
4037
gpgconf --kill all; \
4138
rm -rf "$GNUPGHOME"; \
42-
apt-key list; \
4339
\
4440
apt-mark auto '.*' > /dev/null; \
4541
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
4642
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
4743
\
48-
echo 'deb https://packagecloud.io/slacktechnologies/slack/debian jessie main' > /etc/apt/sources.list.d/slack.list
44+
echo 'deb [ signed-by=/etc/apt/keyrings/slack.asc ] https://packagecloud.io/slacktechnologies/slack/debian jessie main' > /etc/apt/sources.list.d/slack.list; \
45+
apt-get update; \
46+
apt-get dist-clean
4947

5048
ENV SLACK_VERSION 4.45.69
5149

5250
RUN set -eux; \
53-
apt-get update; \
54-
apt-get install -y --no-install-recommends \
51+
apt-get install --update -y --no-install-recommends \
5552
slack-desktop="$SLACK_VERSION" \
5653
# 3.0.2: slack: error while loading shared libraries: libX11-xcb.so.1: cannot open shared object file: No such file or directory
5754
libx11-xcb1 \
@@ -64,10 +61,10 @@ RUN set -eux; \
6461
# 4.4.0: libGL error: failed to load driver: (i915_dri.so, i194, i965, swrast_dir.so, swrast)
6562
libgl1-mesa-dri \
6663
; \
67-
rm -rf /var/lib/apt/lists/*; \
64+
apt-get dist-clean; \
6865
slack="$(command -v slack)"; \
6966
slack="$(readlink -ev "$slack")"; \
70-
! { ldd "$slack" | grep 'not found'; }
67+
if ldd "$slack" | grep 'not found'; then exit 1; fi
7168

7269
COPY browser.sh /usr/local/bin/
7370
ENV BROWSER /usr/local/bin/browser.sh

slack/Dockerfile.template

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:trixie-slim
22

33
RUN set -eux; \
4-
apt-get update; \
5-
apt-get install -y --no-install-recommends \
4+
apt-get install --update -y --no-install-recommends \
65
ca-certificates \
76
# used as a fake browser so clicked URLs (and internal Slack behavior that wants to open a browser) pop up with a URL + clipboard instead of silently doing nothing
87
zenity xclip \
98
; \
10-
rm -rf /var/lib/apt/lists/*
9+
apt-get dist-clean
1110

1211
ENV LANG C.UTF-8
1312

@@ -22,30 +21,28 @@ ENV SLACK_GPG_KEY DB085A08CA13B8ACB917E0F6D938EC0D038651BD
2221
RUN set -eux; \
2322
\
2423
savedAptMark="$(apt-mark showmanual)"; \
25-
apt-get update; \
26-
apt-get install -y --no-install-recommends \
24+
apt-get install --update -y --no-install-recommends \
2725
gnupg \
2826
; \
29-
rm -rf /var/lib/apt/lists; \
3027
\
3128
export GNUPGHOME="$(mktemp -d)"; \
3229
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$SLACK_GPG_KEY"; \
33-
gpg --batch --export --armor "$SLACK_GPG_KEY" > /etc/apt/trusted.gpg.d/slack.gpg.asc; \
30+
gpg --batch --export --armor "$SLACK_GPG_KEY" > /etc/apt/keyrings/slack.asc; \
3431
gpgconf --kill all; \
3532
rm -rf "$GNUPGHOME"; \
36-
apt-key list; \
3733
\
3834
apt-mark auto '.*' > /dev/null; \
3935
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
4036
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
4137
\
42-
echo 'deb https://packagecloud.io/slacktechnologies/slack/debian jessie main' > /etc/apt/sources.list.d/slack.list
38+
echo 'deb [ signed-by=/etc/apt/keyrings/slack.asc ] https://packagecloud.io/slacktechnologies/slack/debian jessie main' > /etc/apt/sources.list.d/slack.list; \
39+
apt-get update; \
40+
apt-get dist-clean
4341

4442
ENV SLACK_VERSION {{ .version }}
4543

4644
RUN set -eux; \
47-
apt-get update; \
48-
apt-get install -y --no-install-recommends \
45+
apt-get install --update -y --no-install-recommends \
4946
slack-desktop="$SLACK_VERSION" \
5047
# 3.0.2: slack: error while loading shared libraries: libX11-xcb.so.1: cannot open shared object file: No such file or directory
5148
libx11-xcb1 \
@@ -58,10 +55,10 @@ RUN set -eux; \
5855
# 4.4.0: libGL error: failed to load driver: (i915_dri.so, i194, i965, swrast_dir.so, swrast)
5956
libgl1-mesa-dri \
6057
; \
61-
rm -rf /var/lib/apt/lists/*; \
58+
apt-get dist-clean; \
6259
slack="$(command -v slack)"; \
6360
slack="$(readlink -ev "$slack")"; \
64-
! { ldd "$slack" | grep 'not found'; }
61+
if ldd "$slack" | grep 'not found'; then exit 1; fi
6562

6663
COPY browser.sh /usr/local/bin/
6764
ENV BROWSER /usr/local/bin/browser.sh

0 commit comments

Comments
 (0)