Skip to content

Commit

Permalink
freebsd: provide package installation through real scripts
Browse files Browse the repository at this point in the history
bash functions require that /bin/sh is bash, or that SHELL is set to bash
in the Dockerfile, but the former wastes resources and the latter clashes
with OCI containers apparently not supporting SHELL.

Calling the functionality as real scripts avoids the issue.
  • Loading branch information
ydirson committed Jan 9, 2024
1 parent 6268e9f commit 8239f50
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 0 deletions.
4 changes: 4 additions & 0 deletions docker/Dockerfile.aarch64-unknown-freebsd
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ ENV CROSS_SYSROOT=/usr/local/aarch64-unknown-freebsd13
COPY freebsd-gcc.sh /usr/bin/"$CROSS_TOOLCHAIN_PREFIX"gcc.sh
COPY toolchain.cmake /opt/toolchain.cmake

COPY freebsd-fetch-best-mirror.sh /
COPY freebsd-setup-packagesite.sh /
COPY freebsd-install-package.sh /

ENV CARGO_TARGET_AARCH64_UNKNOWN_FREEBSD_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc.sh \
AR_aarch64_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"ar \
CC_aarch64_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"gcc \
Expand Down
4 changes: 4 additions & 0 deletions docker/Dockerfile.i686-unknown-freebsd
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ ENV CROSS_SYSROOT=/usr/local/i686-unknown-freebsd13
COPY freebsd-gcc.sh /usr/bin/"$CROSS_TOOLCHAIN_PREFIX"gcc.sh
COPY toolchain.cmake /opt/toolchain.cmake

COPY freebsd-fetch-best-mirror.sh /
COPY freebsd-setup-packagesite.sh /
COPY freebsd-install-package.sh /

ENV CARGO_TARGET_I686_UNKNOWN_FREEBSD_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc.sh \
AR_i686_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"ar \
CC_i686_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"gcc \
Expand Down
4 changes: 4 additions & 0 deletions docker/Dockerfile.x86_64-unknown-freebsd
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ ENV CROSS_SYSROOT=/usr/local/x86_64-unknown-freebsd13
COPY freebsd-gcc.sh /usr/bin/"$CROSS_TOOLCHAIN_PREFIX"gcc.sh
COPY toolchain.cmake /opt/toolchain.cmake

COPY freebsd-fetch-best-mirror.sh /
COPY freebsd-setup-packagesite.sh /
COPY freebsd-install-package.sh /

ENV CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc.sh \
AR_x86_64_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"ar \
CC_x86_64_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"gcc \
Expand Down
6 changes: 6 additions & 0 deletions docker/freebsd-fetch-best-mirror.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
set -e

# shellcheck disable=SC1091
. /freebsd-install.sh
fetch_best_freebsd_mirror "$@"
6 changes: 6 additions & 0 deletions docker/freebsd-install-package.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
set -e

# shellcheck disable=SC1091
. /freebsd-install.sh
install_freebsd_package "$@"
6 changes: 6 additions & 0 deletions docker/freebsd-setup-packagesite.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
set -e

# shellcheck disable=SC1091
. /freebsd-install.sh
setup_freebsd_packagesite "$@"

0 comments on commit 8239f50

Please sign in to comment.