From 2e5026db0dc483e8d75d4793de16b3ce4042f3d4 Mon Sep 17 00:00:00 2001 From: Felix Wiegand Date: Thu, 22 Feb 2024 16:32:38 +0100 Subject: [PATCH] Delete docker directory --- docker/Dockerfile.gnu | 7 ------- docker/Dockerfile.musl | 16 ---------------- docker/README.md | 17 ----------------- docker/config-musl-cross-make.mak | 6 ------ 4 files changed, 46 deletions(-) delete mode 100644 docker/Dockerfile.gnu delete mode 100644 docker/Dockerfile.musl delete mode 100644 docker/README.md delete mode 100644 docker/config-musl-cross-make.mak diff --git a/docker/Dockerfile.gnu b/docker/Dockerfile.gnu deleted file mode 100644 index 6c2078bf2..000000000 --- a/docker/Dockerfile.gnu +++ /dev/null @@ -1,7 +0,0 @@ -FROM rustembedded/cross:x86_64-unknown-linux-gnu - -ENV LIBCLANG_PATH /usr/lib/llvm-10/lib -ENV LLVM_CONFIG_PATH /usr/bin -RUN apt-get update -RUN apt-get install -y build-essential wget gnupg lsb-release software-properties-common apt-transport-https ca-certificates # Otherwise LLVM bump below fails -RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" diff --git a/docker/Dockerfile.musl b/docker/Dockerfile.musl deleted file mode 100644 index 4988ab7e4..000000000 --- a/docker/Dockerfile.musl +++ /dev/null @@ -1,16 +0,0 @@ -FROM brainstorm/cross-x86_64-unknown-linux-musl:upstream - -ENV DEBIAN_FRONTEND noninteractive -ENV PKG_CONFIG_ALLOW_CROSS 1 - -ENV LIBCLANG_PATH /usr/lib/llvm-10/lib -ENV LLVM_CONFIG_PATH /usr/bin - -WORKDIR /root - -# Otherwise LLVM bump below fails -RUN apt-get install -y wget gnupg lsb-release software-properties-common apt-transport-https ca-certificates - -# Autodetect and fetch latest LLVM repos for the current distro, avoids LLVM warnings and other issues, might generate slower builds for now though, see: -# https://www.phoronix.com/scan.php?page=news_item&px=Rust-Hurt-On-LLVM-10 -RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" diff --git a/docker/README.md b/docker/README.md deleted file mode 100644 index 8ce0ee1cd..000000000 --- a/docker/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# cross rustembedded containers - -Allows to compile (rust-)htslib in a variety of environments and architectures via [rustembedded cross](https://github.com/rust-embedded/cross). - -## Quickstart - -```shell -$ cd docker -$ docker build -t brainstorm/cross-x86_64-unknown-linux-musl:1.0.0 . -f Dockerfile.musl -$ docker build -t brainstorm/cross-x86_64-unknown-linux-gnu:1.0.0 . -f Dockerfile.gnu -``` - -Then, to build and test rust-htslib with the above containers, proceed as you would with `cargo`, using `cross` instead, i.e: - -```shell -$ cross build --target x86_64-unknown-linux-musl -``` diff --git a/docker/config-musl-cross-make.mak b/docker/config-musl-cross-make.mak deleted file mode 100644 index b57e680c3..000000000 --- a/docker/config-musl-cross-make.mak +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = x86_64-linux-musl -OUTPUT = /usr/local/musl -GCC_VER = 9.2.0 -BINUTILS_VER = 2.33.1 -MUSL_VER=1.2.4 -