From b65396b294fb9c487aac8250c4d4909b7a3ead0d Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Tue, 26 Aug 2025 10:14:40 +0200 Subject: [PATCH] chore: update docker config for building old versions --- .docker/.dockerignore | 1 + .docker/docker-0.2.x/.dockerignore | 2 ++ .docker/docker-0.2.x/.gitignore | 1 + .docker/docker-0.2.x/Dockerfile | 9 +++++---- .docker/docker-0.2.x/Makefile | 6 +++--- 5 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 .docker/.dockerignore create mode 100644 .docker/docker-0.2.x/.dockerignore create mode 100644 .docker/docker-0.2.x/.gitignore diff --git a/.docker/.dockerignore b/.docker/.dockerignore new file mode 100644 index 00000000..1decfbc0 --- /dev/null +++ b/.docker/.dockerignore @@ -0,0 +1 @@ +/docker-0.2.x diff --git a/.docker/docker-0.2.x/.dockerignore b/.docker/docker-0.2.x/.dockerignore new file mode 100644 index 00000000..e28b7d0f --- /dev/null +++ b/.docker/docker-0.2.x/.dockerignore @@ -0,0 +1,2 @@ +/@* +/Makefile diff --git a/.docker/docker-0.2.x/.gitignore b/.docker/docker-0.2.x/.gitignore new file mode 100644 index 00000000..903bf696 --- /dev/null +++ b/.docker/docker-0.2.x/.gitignore @@ -0,0 +1 @@ +/@* diff --git a/.docker/docker-0.2.x/Dockerfile b/.docker/docker-0.2.x/Dockerfile index 41971a42..9476d12f 100644 --- a/.docker/docker-0.2.x/Dockerfile +++ b/.docker/docker-0.2.x/Dockerfile @@ -56,10 +56,11 @@ RUN apk add --no-cache \ openssl-libs-static \ openssl-dev -COPY double-conversion-3.1.5.tar.gz /opt/ -COPY fmt-7.1.3.tar.gz /opt/ -COPY fuse-3.10.4.tar.xz /opt/ -COPY glog-0.5.0.tar.gz /opt/ +RUN wget https://github.com/google/double-conversion/archive/refs/tags/v3.1.5.tar.gz -O /opt/double-conversion-3.1.5.tar.gz \ + && wget https://github.com/fmtlib/fmt/archive/refs/tags/7.1.3.tar.gz -O /opt/fmt-7.1.3.tar.gz \ + && wget https://github.com/libfuse/libfuse/releases/download/fuse-3.10.4/fuse-3.10.4.tar.xz -O /opt/fuse-3.10.4.tar.xz \ + && wget https://github.com/google/glog/archive/refs/tags/v0.5.0.tar.gz -O /opt/glog-0.5.0.tar.gz + COPY build_libs.sh /opt/ RUN bash /opt/build_libs.sh diff --git a/.docker/docker-0.2.x/Makefile b/.docker/docker-0.2.x/Makefile index 5a294856..687d7d0b 100644 --- a/.docker/docker-0.2.x/Makefile +++ b/.docker/docker-0.2.x/Makefile @@ -5,9 +5,9 @@ NPROC:=$(shell nproc) COMMON_RUN_OPTS=-it --rm \ --cap-add SYS_ADMIN --device /dev/fuse --privileged \ - --mount type=bind,source=/home/mhx/git/github/dwarfs,target=/workspace,readonly \ - --mount type=bind,source="$(ROOT_DIR)"/../@ccache,target=/ccache \ - --mount type=bind,source="$(ROOT_DIR)"/../@home,target=/root \ + --mount type=bind,source="$(ROOT_DIR)"/../..,target=/workspace,readonly \ + --mount type=bind,source="$(ROOT_DIR)"/@ccache,target=/ccache \ + --mount type=bind,source="$(ROOT_DIR)"/@home,target=/root \ --env CCACHE_DIR=/ccache --env CTEST_PARALLEL_LEVEL=$(NPROC) \ --entrypoint /bin/bash