From 6d2530f25ac8787ddb10f2960e5a090aa8496add Mon Sep 17 00:00:00 2001 From: iphydf Date: Thu, 5 Dec 2024 00:32:26 +0000 Subject: [PATCH] chore: Add MODULE.bazel to the docker image early on. We need it for bazel 7. For bazel 6, it's also good practice. --- dockerfiles | 2 +- qtox | 2 +- tools/built/src/Dockerfile.third_party | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dockerfiles b/dockerfiles index 8292b05b..5ceb6732 160000 --- a/dockerfiles +++ b/dockerfiles @@ -1 +1 @@ -Subproject commit 8292b05bedcdb53dacb29dc0397834996d4ab0ae +Subproject commit 5ceb6732a16f1acb1795a0bd931d3b7742bb6872 diff --git a/qtox b/qtox index 5dee37d8..9c5bfabf 160000 --- a/qtox +++ b/qtox @@ -1 +1 @@ -Subproject commit 5dee37d82d8296ebcdad7de58ae0416e5e038c5c +Subproject commit 9c5bfabf4133a9fb8c9e18249fc1e94b9d595253 diff --git a/tools/built/src/Dockerfile.third_party b/tools/built/src/Dockerfile.third_party index 3536595a..acfd6df9 100644 --- a/tools/built/src/Dockerfile.third_party +++ b/tools/built/src/Dockerfile.third_party @@ -1,4 +1,4 @@ -FROM toxchat/bazel:24.05 +FROM toxchat/bazel:latest # Needed for Cirrus CI to work. RUN ["mkdir", "/tmp/cirrus-ci-build"] @@ -8,7 +8,7 @@ RUN ["mkdir", "/tmp/cirrus-ci-build"] # minimum number of files to avoid rebuilding this when making changes to the # toktok-stack tools. COPY --chown=builder:users tools/bazelrc.boot /src/workspace/.bazelrc -COPY --chown=builder:users BUILD.bazel WORKSPACE .bazelignore ghc.nix /src/workspace/ +COPY --chown=builder:users BUILD.bazel MODULE.bazel WORKSPACE .bazelignore ghc.nix /src/workspace/ COPY --chown=builder:users third_party /src/workspace/third_party COPY --chown=builder:users tools/config /src/workspace/tools/config COPY --chown=builder:users tools/workspace /src/workspace/tools/workspace