Skip to content

Commit 5d6c763

Browse files
committed
Ensure workloads support amd64
Signed-off-by: Paulo Gomes <[email protected]>
1 parent 1ab8bc7 commit 5d6c763

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

workloads/chrome/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ ARG TAG=latest
22
ARG REGISTRY=ghcr.io/qubesome
33
FROM ${REGISTRY}/base:${TAG}
44

5+
ARG TARGETARCH
56
RUN curl https://dl.google.com/linux/linux_signing_key.pub -O && \
67
rpm --import linux_signing_key.pub && rm linux_signing_key.pub && \
7-
zypper -n refresh && \
8-
zypper -n addrepo --refresh https://dl.google.com/linux/chrome/rpm/stable/x86_64 Google-Chrome && \
8+
zypper -n refresh && \
9+
RPM_ARCH=$([ "$TARGETARCH" = "amd64" ] && echo "x86_64" || echo "aarch64") && \
10+
zypper -n addrepo --refresh https://dl.google.com/linux/chrome/rpm/stable/${RPM_ARCH} Google-Chrome && \
911
zypper -n install -y google-chrome-stable && \
1012
zypper -n cc -a && \
1113
zypper -n rm zypper && \

workloads/obsidian/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ FROM ${REGISTRY}/base:${TAG}
44

55
# renovate: datasource=github-tags depName=obsidianmd/obsidian-releases
66
ARG OBSIDIAN_VERSION=v1.10.6
7+
ARG TARGETARCH
78

8-
ARG OBSIDIAN_URL="https://github.com/obsidianmd/obsidian-releases/releases/download/${OBSIDIAN_VERSION}/obsidian_${OBSIDIAN_VERSION#v}_amd64.deb"
9-
10-
RUN curl -o /tmp/obsidian.deb -L "${OBSIDIAN_URL}" && \
9+
RUN OBSIDIAN_URL="https://github.com/obsidianmd/obsidian-releases/releases/download/${OBSIDIAN_VERSION}/obsidian_${OBSIDIAN_VERSION#v}_${TARGETARCH}.deb" && \
10+
curl -o /tmp/obsidian.deb -L "${OBSIDIAN_URL}" && \
1111
zypper -n refresh && \
1212
zypper install -y dpkg \
1313
mozilla-nspr mozilla-nss xdg-user-dirs xdg-utils \

workloads/slack/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@ ARG REGISTRY=ghcr.io/qubesome
33
FROM ${REGISTRY}/base:${TAG}
44

55
ARG SLACK_VERSION=4.47.69
6+
ARG TARGETARCH
67

7-
ARG SLACK_URL="https://downloads.slack-edge.com/desktop-releases/linux/x64/${SLACK_VERSION}/slack-${SLACK_VERSION}-0.1.el8.x86_64.rpm"
88
ARG SLACK_PUB_KEY_URL="https://slack.com/gpg/slack_pubkey_20251016.gpg"
99

10-
RUN curl -o /tmp/slack.pub -L "${SLACK_PUB_KEY_URL}" && \
10+
RUN SLACK_ARCH=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "arm64") && \
11+
RPM_ARCH=$([ "$TARGETARCH" = "amd64" ] && echo "x86_64" || echo "aarch64") && \
12+
SLACK_URL="https://downloads.slack-edge.com/desktop-releases/linux/${SLACK_ARCH}/${SLACK_VERSION}/slack-${SLACK_VERSION}-0.1.el8.${RPM_ARCH}.rpm" && \
13+
curl -o /tmp/slack.pub -L "${SLACK_PUB_KEY_URL}" && \
1114
rpm --import /tmp/slack.pub && rm /tmp/slack.pub && \
1215
curl -o /tmp/slack.rpm -L "${SLACK_URL}" && \
1316
rpm --checksig /tmp/slack.rpm && \

0 commit comments

Comments
 (0)