Skip to content

Commit

Permalink
Revert "Add workaround for issue with qemu on GHA runners"
Browse files Browse the repository at this point in the history
The workaround doesn't work.

This reverts commit bc86113.
  • Loading branch information
bernd committed Feb 13, 2025
1 parent bc86113 commit 1173ee7
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 18 deletions.
6 changes: 0 additions & 6 deletions docker/datanode/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Workaround for issue: https://github.com/docker/setup-qemu-action/issues/198
FROM --platform=$BUILDPLATFORM multiarch/qemu-user-static AS qemu

FROM ubuntu:22.04

# Build time variables - not persistent in the container image
Expand Down Expand Up @@ -33,9 +30,6 @@ ENV GDN_USER=graylog

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# Workaround for issue: https://github.com/docker/setup-qemu-action/issues/198
COPY --from=qemu /usr/bin/qemu-*-static /usr/bin/

RUN groupadd -r "$GDN_GROUP" \
&& useradd --no-log-init -r \
-s "/usr/sbin/nologin" \
Expand Down
6 changes: 0 additions & 6 deletions docker/enterprise/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Workaround for issue: https://github.com/docker/setup-qemu-action/issues/198
FROM --platform=$BUILDPLATFORM multiarch/qemu-user-static AS qemu

# layer for download and verifying
FROM ubuntu:jammy as graylog-downloader

Expand All @@ -26,9 +23,6 @@ ARG DOWNLOAD_URL=none

WORKDIR /tmp

# Workaround for issue: https://github.com/docker/setup-qemu-action/issues/198
COPY --from=qemu /usr/bin/qemu-*-static /usr/bin/

# hadolint ignore=DL3008,DL3015
RUN \
apt-get update && \
Expand Down
6 changes: 0 additions & 6 deletions docker/oss/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Workaround for issue: https://github.com/docker/setup-qemu-action/issues/198
FROM --platform=$BUILDPLATFORM multiarch/qemu-user-static AS qemu

# layer for download and verifying
FROM ubuntu:jammy as graylog-downloader

Expand All @@ -26,9 +23,6 @@ ARG DOWNLOAD_URL=none

WORKDIR /tmp

# Workaround for issue: https://github.com/docker/setup-qemu-action/issues/198
COPY --from=qemu /usr/bin/qemu-*-static /usr/bin/

# hadolint ignore=DL3008,DL3015
RUN \
apt-get update && \
Expand Down

0 comments on commit 1173ee7

Please sign in to comment.