Skip to content

Commit 2eb40db

Browse files
committed
fix multiple builds, stop basing on dead sid image
1 parent fb1fc33 commit 2eb40db

4 files changed

Lines changed: 10 additions & 7 deletions

File tree

apps/edge/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
ARG REPO
2-
FROM ghcr.io/${REPO}:debian-sid AS rootfs
2+
FROM ghcr.io/${REPO}:debian-trixie AS rootfs
33
ARG REPO
44

55
# Install packages
66
RUN \
77
echo "**** install packages ****" && \
88
apt-get update && \
9+
apt-get install -y --no-install-recommends \
10+
gpg && \
911
curl -o \
1012
/tmp/edge.deb -L \
1113
"https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/$(curl -sLq https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/ | awk -F'(<a href="|")' '/href=/ {print $2}' | sort --version-sort | tail -1)" && \

apps/handbrake/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG REPO
2-
FROM ghcr.io/${REPO}:debian-sid AS rootfs
2+
FROM ghcr.io/${REPO}:debian-trixie AS rootfs
33
ARG REPO
44

55
# Install packages

apps/logisim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG REPO
2-
FROM ghcr.io/${REPO}:debian-sid AS rootfs
2+
FROM ghcr.io/${REPO}:debian-trixie AS rootfs
33
ARG REPO
44

55
# Install packages

apps/zotero/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ RUN \
99
apt-get install -y --no-install-recommends \
1010
lbzip2 \
1111
libdbus-glib-1-2 \
12-
libgtk-3-0 && \
12+
libgtk-3-0 \
13+
xz-utils && \
1314
ZOTERO_VERSION=$(curl -sL https://www.zotero.org/download/ \
1415
|awk -F'linux-x86_64' '/linux-x86_64/ {print $2}' \
1516
| awk -F'"' '{print $3}' \
1617
| tail -n1) && \
1718
curl -o \
18-
/tmp/zotero.tar.bz2 -L \
19-
"https://download.zotero.org/client/release/${ZOTERO_VERSION}/Zotero-${ZOTERO_VERSION}_linux-x86_64.tar.bz2" && \
19+
/tmp/zotero.tar.xz -L \
20+
"https://download.zotero.org/client/release/${ZOTERO_VERSION}/Zotero-${ZOTERO_VERSION}_linux-x86_64.tar.xz" && \
2021
mkdir /opt/zotero && \
2122
tar xf \
22-
/tmp/zotero.tar.bz2 -C \
23+
/tmp/zotero.tar.xz -C \
2324
/opt/zotero/ --strip-components=1 && \
2425
echo "**** customize desktop file ****" && \
2526
sed -i \

0 commit comments

Comments
 (0)