Skip to content

Commit

Permalink
Fix solaris base image build
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Mar 12, 2023
1 parent 4a17be1 commit 22db560
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions docker/base/solaris.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.4

# Refs:
# - https://github.com/rust-lang/rust/blob/1.67.0/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh
# - https://github.com/rust-lang/rust/blob/542ed2bf72b232b245ece058fc11aebb1ca507d7/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh

ARG UBUNTU_VERSION=18.04

Expand Down Expand Up @@ -40,26 +40,24 @@ apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C
echo "deb https://apt.dilos.org/dilos dilos2 main" >/etc/apt/sources.list.d/dilos.list
dpkg --add-architecture "${dpkg_arch}"
apt-get -o Acquire::Retries=10 update -qq
apt-get -o Acquire::Retries=10 -o Dpkg::Use-Pty=0 download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances \
apt-get -o Acquire::Retries=10 -o Dpkg::Use-Pty=0 install -y --download-only --no-install-recommends \
"libc:${dpkg_arch}" \
"liblgrp-dev:${dpkg_arch}" \
"liblgrp:${dpkg_arch}" \
"libm-dev:${dpkg_arch}" \
"libpthread:${dpkg_arch}" \
"libresolv:${dpkg_arch}" \
"librt:${dpkg_arch}" \
"libsendfile-dev:${dpkg_arch}" \
"libsendfile:${dpkg_arch}" \
"libsocket:${dpkg_arch}" \
"system-crt:${dpkg_arch}" \
"system-header:${dpkg_arch}" \
| grep '^\w')
ls
"system-header:${dpkg_arch}"
ls /var/cache/apt/archives/
set +x
for deb in *"${dpkg_arch}.deb"; do
for deb in /var/cache/apt/archives/*"${dpkg_arch}.deb"; do
dpkg -x "${deb}" .
rm "${deb}"
done
apt-get clean
EOF
# The -dev packages are not available from the apt repository we're using.
# However, those packages are just symlinks from *.so to *.so.<version>.
Expand Down

0 comments on commit 22db560

Please sign in to comment.