Skip to content

Commit baba79d

Browse files
committed
Revert the stopgap build fix from PelicanPlatform#3069
It should no longer be necessary as of PelicanPlatform#3051.
1 parent ce9ae8c commit baba79d

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

images/Dockerfile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -665,21 +665,12 @@ ARG TARGETPLATFORM
665665
ARG TARGETOS
666666
ARG TARGETARCH
667667

668-
# Install select development packages.
669-
# We need to work around a bug with ARM64 emulation and `tar`:
670-
#
671-
# - Issue: https://github.com/tonistiigi/binfmt/issues/285
672-
# - Workaround: https://github.com/apollographql/apollo-runtime/pull/71
673-
#
674-
# The locale settings below should match the defaults in /etc/locale.conf
675-
# and are necessary for `bsdtar` to be able to extract the Go distribution.
676-
ENV LANG=C.utf8 LC_ALL=C.utf8
677668
RUN --mount=type=cache,id=dnf-${TARGETPLATFORM},target=/var/cache/dnf,sharing=locked <<ENDRUN
678669
set -eux
679670
set -o pipefail
680671

681672
# Install packages for building Pelican.
682-
dnf install -y git make bsdtar && ln -sf /usr/bin/bsdtar /usr/bin/tar
673+
dnf install -y git make
683674

684675
# Install HTCondor for integration tests, but forcibly remove the
685676
# Pelican packages that it pulls in so that there is zero chance tests

0 commit comments

Comments
 (0)