Merge dashpay#6604: ci: extract "slim" container to run functional tests and add multiprocess and tsan, drop unneeded packages

PastaPastaPasta · PastaPastaPasta · commit 794d346a7130 · 2025-03-24T12:45:27.000-05:00
76f99cd doc: update container documentation (Kittywhiskers Van Gogh) b8b9bb4 ci: split out `multiprocess` linting to a separate step on Actions (Kittywhiskers Van Gogh) 94dedba revert: tentatively drop multiprocess and tsan functional tests (Kittywhiskers Van Gogh) b379708 trivial: `lldbUpdAltArgs` -> `llvmUpdAltArgs` (Kittywhiskers Van Gogh) 90710b3 ci: avoid making copies when collecting logs, misc. script fixes (Kittywhiskers Van Gogh) 89d977d ci: use slim container for functional tests (Kittywhiskers Van Gogh) 22e9acd ci: remove old dependencies, packages not used in building or testing (Kittywhiskers Van Gogh) 630bb0c ci: consolidate package installation in `ci` container (Kittywhiskers Van Gogh) 837d10a ci: extract minimum environment needed to run functional tests (Kittywhiskers Van Gogh) 4bcd093 ci: stop using LLVM setup script to setup repo (Kittywhiskers Van Gogh) a4ce15b ci: rename `ci/Dockerfile`, switch to `devthefuture/dockerfile-x` (Kittywhiskers Van Gogh) 5413955 ci: move packages needed to run `dash-qt` into `develop` container (Kittywhiskers Van Gogh) Pull request description: ## Motivation [dash#6583](dashpay#6583) introduced functional tests to GitHub Actions and due to a combination of limited disk space available on runners and restrictions on ways to free up said disk space (as described in [dash#6583](dashpay#6583)), `multiprocess` and `tsan` builds had to be excluded ([commit](dashpay@3461c14)). Despite measures to reign in disk usage ([source](https://github.com/dashpay/dash/blob/26ea618b81084c74c0a9bb1fed5321012c1ac8ac/ci/dash/slim-workspace.sh)), we are experiencing sporadic failures due to space exhaustion ([build](https://github.com/dashpay/dash/actions/runs/13572578591/job/37941577942), [build](https://github.com/dashpay/dash/actions/runs/13572201698/job/37940403595)). To take care of this, we are going to extract portions of our `ci` container into `ci-slim`, containing only the parts needed to run (sanitizer-enabled) binaries, functional tests and (some) linters. ## Additional Information * We have used [`edrevo/dockerfile-plus`](https://github.com/edrevo/dockerfile-plus) to allow container definitions inherit other container definitions, which has allowed for a ready-to-use interactive container ([`develop`](https://github.com/dashpay/dash/blob/26ea618b81084c74c0a9bb1fed5321012c1ac8ac/contrib/containers/develop/Dockerfile)) to be built on top of our CI container ([`ci`](https://github.com/dashpay/dash/blob/26ea618b81084c74c0a9bb1fed5321012c1ac8ac/contrib/containers/ci/Dockerfile)) with ease (introduced in [dash#4336](dashpay#4336)). Unfortunately, since then, there has been little activity at [`edrevo/dockerfile-plus`](https://github.com/edrevo/dockerfile-plus), last code contribution was ~4 years ago ([commit](edrevo/dockerfile-plus@90dc08d)) and as this PR splits off `ci` to `ci-slim`, it appears `dockerfile-plus` has difficulty in working with `Dockerfiles` that inherit other `Dockerfiles` (see below). <details> <summary>Error message:</summary> ``` $ docker-compose build #0 building with "default" instance using docker driver [...] #1 [container internal] load build definition from Dockerfile #1 transferring dockerfile: 1.57kB done #1 DONE 0.0s [...] #7 [container internal] load build definition from Dockerfile #7 DONE 0.0s failed to solve: failed to create LLB definition: dockerfile parse error line 9: unknown instruction: INCLUDE+ ``` </details> To mitigate this, we are switching over to [`devthefuture/dockerfile-x`](https://codeberg.org/devthefuture/dockerfile-x), which come with minor changes in syntax. * As [`devthefuture/dockerfile-x`](https://codeberg.org/devthefuture/dockerfile-x) (like [`edrevo/dockerfile-plus`](https://github.com/edrevo/dockerfile-plus)) relies on BuildKit, it has been explicitly enabled for GitLab, without which, it fails ([build](https://gitlab.com/dashpay/dash/-/jobs/9276738177#L194)). * As scoping in `Dockerfile`s are relative to the `Dockerfile` itself ([source](https://codeberg.org/devthefuture/dockerfile-x#scoping)), `develop/Dockerfile` can include `ci/Dockerfile` by setting the context one directory behind (which is possible for the root `Dockerfile`) but when `ci/Dockerfile` is parsed, it will search within the `ci` folder and not from the context folder set earlier and so, including `ci-slim/Dockerfile` would come up empty as it would resolve to `ci/ci-slim/Dockerfile`, which doesn't exist. To work around this, both `ci` and `ci-slim` definitions need to share the same directory and to allow for that, `ci/Dockerfile` is now `ci/ci.Dockerfile`, so that `develop/Dockerfile` can set the context a directory behind, find `ci/ci.Dockerfile`, which will search within `ci` for `./ci-slim.Dockerfile`, which will be found successfully. * We have switched away from using the official LLVM installation script to importing the repository manually as we need only a select few packages to run sanitizer-enabled builds and functional tests and the script only gives you a choice between default packages and all packages. * While avoiding LLVM packages entirely in the `ci-slim` container was most desirable, doing so breaks sanitizer builds ([build](https://github.com/kwvg/dash/actions/runs/13585208794/job/37981496193#step:6:2571)) * Switching over to manual import also let us drop a few packages as the script has to probe and work around bugs while our base environment remains relatively similar. * Space occupied by containers. Calculated by modifying `develop/docker-compose.yml` to point at different `Dockerfile`s and building them with `docker compose`, then passing them to [dive](https://github.com/wagoodman/dive) v0.12.0. | Name | Commit | Size | Efficiency Score | Potential Waste | | --------- | -------------------- | ------ | ---------------- | --------------- | | `ci` | `develop` (26ea618) | 4.4 GB | 99% | 74 MB | | `develop` | `develop` (26ea618) | 4.5 GB | 99% | 78 MB | | `ci-slim` | This PR (db6a3fd0) | 1.6 GB | 97% | 64 MB | | `ci` | This PR (db6a3fd0) | 4.3 GB | 99% | 70 MB | | `develop` | This PR (db6a3fd0) | 4.3 GB | 99% | 74 MB | ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)** - [x] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 76f99cd PastaPastaPasta: utACK 76f99cd Tree-SHA512: c0afc570dfc9f6db3dbacbf40b4a2416e993b5e2e503694b9b564a4e00600aa4c290b7c7395f0abc1a7b269c488ed86f4c4c2e64436f38b7ea1653057db83259
diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,5 @@
 **
-!contrib/containers/ci/Dockerfile
+!contrib/containers/ci/ci.Dockerfile
+!contrib/containers/ci/ci-slim.Dockerfile
 !contrib/containers/deploy/Dockerfile
 !contrib/containers/develop/Dockerfile
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -2,10 +2,23 @@ name: Build container
 
 on:
   workflow_call:
+    inputs:
+      context:
+        description: "Path to use for build context"
+        required: true
+        type: string
+      file:
+        description: "Path to Dockerfile"
+        required: true
+        type: string
+      name:
+        description: "Container name"
+        required: true
+        type: string
     outputs:
       path:
         description: "Path to built container"
-        value: ghcr.io/${{ jobs.build.outputs.repo }}/dashcore-ci-runner:${{ jobs.build.outputs.tag }}
+        value: ghcr.io/${{ jobs.build.outputs.repo }}/${{ inputs.name }}:${{ jobs.build.outputs.tag }}
 
 env:
   DOCKER_DRIVER: overlay2
@@ -44,15 +57,15 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
-          context: ./contrib/containers/ci
-          file: ./contrib/containers/ci/Dockerfile
+          context: ${{ inputs.context }}
+          file: ${{ inputs.file }}
           push: true
           tags: |
-            ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ hashFiles('./contrib/containers/ci/Dockerfile') }}
-            ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ steps.prepare.outputs.tag }}
-            ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:latest
+            ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:${{ hashFiles(inputs.file) }}
+            ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:${{ steps.prepare.outputs.tag }}
+            ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:latest
           cache-from: |
-            type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ hashFiles('./contrib/containers/ci/Dockerfile') }}
-            type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ steps.prepare.outputs.tag }}
-            type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:latest
+            type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:${{ hashFiles(inputs.file) }}
+            type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:${{ steps.prepare.outputs.tag }}
+            type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:latest
           cache-to: type=inline
diff --git a/.github/workflows/build-depends.yml b/.github/workflows/build-depends.yml
@@ -70,10 +70,10 @@ jobs:
           path: |
             depends/built
             depends/${{ steps.setup.outputs.HOST }}
-          key: depends-${{ hashFiles('contrib/containers/ci/Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-${{ hashFiles('depends/packages/*') }}
+          key: depends-${{ hashFiles('contrib/containers/ci/ci.Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-${{ hashFiles('depends/packages/*') }}
           restore-keys: |
-            depends-${{ hashFiles('contrib/containers/ci/Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-
-            depends-${{ hashFiles('contrib/containers/ci/Dockerfile') }}-${{ inputs.build-target }}-
+            depends-${{ hashFiles('contrib/containers/ci/ci.Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-
+            depends-${{ hashFiles('contrib/containers/ci/ci.Dockerfile') }}-${{ inputs.build-target }}-
 
       - name: Build depends
         run: |
diff --git a/.github/workflows/build-src.yml b/.github/workflows/build-src.yml
@@ -70,9 +70,9 @@ jobs:
         with:
           path: |
             /cache
-          key: ccache-${{ hashFiles('contrib/containers/ci/Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-${{ github.sha }}
+          key: ccache-${{ hashFiles('contrib/containers/ci/ci.Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-${{ github.sha }}
           restore-keys: |
-            ccache-${{ hashFiles('contrib/containers/ci/Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-
+            ccache-${{ hashFiles('contrib/containers/ci/ci.Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-
 
       - name: Build source
         run: |
@@ -87,6 +87,14 @@ jobs:
           ccache -c
         shell: bash
 
+      - name: Run linters
+        if: inputs.build-target == 'linux64_multiprocess'
+        run: |
+          export BUILD_TARGET="${{ inputs.build-target }}"
+          source ./ci/dash/matrix.sh
+          ./ci/dash/lint-tidy.sh
+        shell: bash
+
       - name: Run unit tests
         run: |
           BASE_OUTDIR="/output"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,6 +16,18 @@ jobs:
   container:
     name: Build container
     uses: ./.github/workflows/build-container.yml
+    with:
+      context: ./contrib/containers/ci
+      file: ./contrib/containers/ci/ci.Dockerfile
+      name: dashcore-ci-runner
+
+  container-slim:
+    name: Build slim container
+    uses: ./.github/workflows/build-container.yml
+    with:
+      context: ./contrib/containers/ci
+      file: ./contrib/containers/ci/ci-slim.Dockerfile
+      name: dashcore-ci-slim
 
   depends-arm-linux:
     name: arm-linux-gnueabihf
@@ -158,35 +170,53 @@ jobs:
   test-linux64:
     name: linux64-test
     uses: ./.github/workflows/test-src.yml
-    needs: [container, src-linux64]
+    needs: [container-slim, src-linux64]
     with:
       bundle-key: ${{ needs.src-linux64.outputs.key }}
       build-target: linux64
-      container-path: ${{ needs.container.outputs.path }}
+      container-path: ${{ needs.container-slim.outputs.path }}
+
+  test-linux64_multiprocess:
+    name: linux64_multiprocess-test
+    uses: ./.github/workflows/test-src.yml
+    needs: [container-slim, src-linux64_multiprocess]
+    with:
+      bundle-key: ${{ needs.src-linux64_multiprocess.outputs.key }}
+      build-target: linux64_multiprocess
+      container-path: ${{ needs.container-slim.outputs.path }}
 
   test-linux64_nowallet:
     name: linux64_nowallet-test
     uses: ./.github/workflows/test-src.yml
-    needs: [container, src-linux64_nowallet]
+    needs: [container-slim, src-linux64_nowallet]
     with:
       bundle-key: ${{ needs.src-linux64_nowallet.outputs.key }}
       build-target: linux64_nowallet
-      container-path: ${{ needs.container.outputs.path }}
+      container-path: ${{ needs.container-slim.outputs.path }}
 
   test-linux64_sqlite:
     name: linux64_sqlite-test
     uses: ./.github/workflows/test-src.yml
-    needs: [container, src-linux64_sqlite]
+    needs: [container-slim, src-linux64_sqlite]
     with:
       bundle-key: ${{ needs.src-linux64_sqlite.outputs.key }}
       build-target: linux64_sqlite
-      container-path: ${{ needs.container.outputs.path }}
+      container-path: ${{ needs.container-slim.outputs.path }}
+
+  test-linux64_tsan:
+    name: linux64_tsan-test
+    uses: ./.github/workflows/test-src.yml
+    needs: [container-slim, src-linux64_tsan]
+    with:
+      bundle-key: ${{ needs.src-linux64_tsan.outputs.key }}
+      build-target: linux64_tsan
+      container-path: ${{ needs.container-slim.outputs.path }}
 
   test-linux64_ubsan:
     name: linux64_ubsan-test
     uses: ./.github/workflows/test-src.yml
-    needs: [container, src-linux64_ubsan]
+    needs: [container-slim, src-linux64_ubsan]
     with:
       bundle-key: ${{ needs.src-linux64_ubsan.outputs.key }}
       build-target: linux64_ubsan
-      container-path: ${{ needs.container.outputs.path }}
+      container-path: ${{ needs.container-slim.outputs.path }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -29,9 +29,10 @@ builder-image:
     - echo $CI_JOB_TOKEN | docker login -u gitlab-ci-token --password-stdin $CI_REGISTRY
   script:
     - cd contrib/containers/ci
+    - export DOCKER_BUILDKIT=1
     - docker pull $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG || true
     - docker pull $CI_REGISTRY_IMAGE:builder-develop || true
-    - docker build --cache-from $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG --cache-from $CI_REGISTRY_IMAGE:builder-develop -t $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG -f Dockerfile .
+    - docker build --cache-from $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG --cache-from $CI_REGISTRY_IMAGE:builder-develop -t $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG -f ci.Dockerfile .
     - docker push $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG
 
 .build-depends-template:
@@ -56,7 +57,7 @@ builder-image:
     # Let all branches share the same cache, which is ok because the depends subsystem is able to handle this properly (it works with hashes of all scripts)
     key:
       files:
-        - contrib/containers/ci/Dockerfile
+        - contrib/containers/ci/ci.Dockerfile
       prefix: ${CI_JOB_NAME}
     paths:
       - depends/built
@@ -116,7 +117,7 @@ builder-image:
     # Let all branches share the same cache, which is ok because ccache is able to handle it
     key:
       files:
-        - contrib/containers/ci/Dockerfile
+        - contrib/containers/ci/ci.Dockerfile
       prefix: ${CI_JOB_NAME}
     paths:
       - cache/ccache
diff --git a/ci/dash/build_src.sh b/ci/dash/build_src.sh
@@ -11,8 +11,7 @@ set -e
 
 source ./ci/dash/matrix.sh
 
-unset CC; unset CXX
-unset DISPLAY
+unset CC CXX DISPLAY;
 
 if [ "$PULL_REQUEST" != "false" ]; then test/lint/commit-script-check.sh "$COMMIT_RANGE"; fi
 
@@ -51,6 +50,8 @@ make distdir VERSION="$BUILD_TARGET"
 cd "dashcore-$BUILD_TARGET"
 bash -c "./configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( cat config.log && false)
 
+# This step influences compilation and therefore will always be a part of the
+# compile step
 if [ "${RUN_TIDY}" = "true" ]; then
   MAYBE_BEAR="bear --config src/.bear-tidy-config"
   MAYBE_TOKEN="--"
@@ -65,22 +66,10 @@ if [ -n "$USE_VALGRIND" ]; then
     "${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh"
 fi
 
-if [ "${RUN_TIDY}" = "true" ]; then
-  set -eo pipefail
-  cd src
-  ( run-clang-tidy -quiet "${MAKEJOBS}" ) | grep -C5 "error"
-  cd ..
-  iwyu_tool.py \
-    "src/compat" \
-    "src/init" \
-    "src/rpc/fees.cpp" \
-    "src/rpc/signmessage.cpp" \
-    -p . "${MAKEJOBS}" \
-    -- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_ROOT_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
-    |& tee "/tmp/iwyu_ci.out"
-  cd src
-  fix_includes.py --nosafe_headers < /tmp/iwyu_ci.out
-  git --no-pager diff
+# GitHub Actions can segment a job into steps, linting is a separate step
+# so Actions runners will perform this step separately.
+if [ "${RUN_TIDY}" = "true" ] && [ "${GITHUB_ACTIONS}" != "true" ]; then
+  "${BASE_ROOT_DIR}/ci/dash/lint-tidy.sh"
 fi
 
 if [ "$RUN_SECURITY_TESTS" = "true" ]; then
diff --git a/ci/dash/lint-tidy.sh b/ci/dash/lint-tidy.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Copyright (c) 2025 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C.UTF-8
+
+set -eo pipefail
+
+# Warning: This script does not generate the compilation database these linters rely
+#          only on nor do they set the requisite build parameters. Make sure you do
+#          that *before* running this script.
+
+cd "${BASE_ROOT_DIR}/build-ci/dashcore-${BUILD_TARGET}/src"
+( run-clang-tidy -quiet "${MAKEJOBS}" ) | grep -C5 "error"
+
+cd "${BASE_ROOT_DIR}/build-ci/dashcore-${BUILD_TARGET}"
+iwyu_tool.py \
+  "src/compat" \
+  "src/init" \
+  "src/rpc/fees.cpp" \
+  "src/rpc/signmessage.cpp" \
+  -p . "${MAKEJOBS}" \
+  -- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_ROOT_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
+  2>&1 | tee "/tmp/iwyu_ci.out"
+
+cd "${BASE_ROOT_DIR}/build-ci/dashcore-${BUILD_TARGET}/src"
+fix_includes.py --nosafe_headers < /tmp/iwyu_ci.out
+git --no-pager diff
diff --git a/ci/dash/slim-workspace.sh b/ci/dash/slim-workspace.sh
@@ -32,7 +32,7 @@ TARGETS=(
   "build-ci/dashcore-${BUILD_TARGET}/src/qt/qrc_dash_locale.cpp"
 )
 
-# Delete directories we don't need
+# Delete what we don't need
 for target in "${TARGETS[@]}"
 do
   if [[ -d "${target}" ]] || [[ -f "${target}" ]]; then
diff --git a/ci/dash/test_integrationtests.sh b/ci/dash/test_integrationtests.sh
@@ -66,7 +66,7 @@ if [ "$BASEDIR" != "" ]; then
     for f in $LOGFILES; do
       d2="testlogs/$d/$(dirname "$f")"
       mkdir -p "$d2"
-      cp "testdatadirs/$BASEDIR/$d/$f" "$d2/"
+      mv "testdatadirs/$BASEDIR/$d/$f" "$d2/"
     done
   done
 fi
diff --git a/contrib/containers/README.md b/contrib/containers/README.md
@@ -1,27 +1,33 @@
 ## Containers
 
-This directory contains configuration files for containerization utilities.
+This directory contains configuration files for containers. Containers that depends on other containers require BuildKit to
+be enabled in order for syntax extensions to work correctly.
 
-Currently two Docker containers exist, `ci` defines how Dash's GitLab CI container is built and the `dev` builds on top of the `ci` to provide a containerized development environment that is as close as possible to CI for contributors! See also [Dash on Docker Hub](https://hub.docker.com/u/dashpay) i.e. for the [dashd container](https://hub.docker.com/r/dashpay/dashd).
+| Name      | Depends On | Purpose                                                                    |
+| --------- | -----------| -------------------------------------------------------------------------- |
+| `ci-slim` | None       | Slimmed down container used to run functional tests and (some) linters     |
+| `ci`      | `ci-slim`  | Full container used to (cross) compile                                     |
+| `develop` | `ci`       | Interactive environment to allow debugging in an environment that's 1:1 CI |
+| `deploy`  | None       | Packaging of builds for release on Docker Hub                              |
+| `guix`    | None       | Interactive environment for building (and packaging) with Guix             |
 
 ### Usage Guide
 
-We utilise edrevo's [dockerfile-plus](https://github.com/edrevo/dockerfile-plus), a syntax extension that
-leverages Docker [BuildKit](https://docs.docker.com/develop/develop-images/build_enhancements/) to reduce
+We utilise edrevo's [devthefuture/dockerfile-x](https://codeberg.org/devthefuture/dockerfile-x), a syntax extension that
+leverages Docker [BuildKit](https://docs.docker.com/build/buildkit/) to reduce
 the amount of repetitive code.
 
-As BuildKit is opt-in within many currently supported versions of Docker (as of this writing), you need to
-set the following environment variables before continuing. While not needed after the initial `docker compose build`
-(barring updates to the `Dockerfile`), we recommend placing this in your `~/.bash_profile`/`~/.zshrc` or equivalent
+As BuildKit is opt-in within some versions of Docker, you may need to set the following environment variables before
+continuing. While not needed after the initial `docker compose build` (barring updates to the `Dockerfile`), we
+recommend placing this in your `~/.bash_profile`/`~/.zshrc` or equivalent
 
 ```bash
 export DOCKER_BUILDKIT=1
 export COMPOSE_DOCKER_CLI_BUILD=1
 ```
 
-After that, it's simply a matter of building and running your own development container. You can use extensions
-for your IDE like Visual Studio Code's [Remote Containers](https://code.visualstudio.com/docs/remote/containers)
-to run terminal commands from inside the terminal and build Dash Core.
+You can use extensions for your IDE like Visual Studio Code's [Remote Containers](https://code.visualstudio.com/docs/remote/containers)
+to run terminal commands from inside the terminal and work with Dash Core.
 
 ```bash
 cd contrib/containers/develop
diff --git a/contrib/containers/ci/Dockerfile b/contrib/containers/ci/Dockerfile
diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
diff --git a/contrib/containers/ci/ci.Dockerfile b/contrib/containers/ci/ci.Dockerfile
diff --git a/contrib/containers/develop/Dockerfile b/contrib/containers/develop/Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ TARGETS=(`
`32`	`32`	`"build-ci/dashcore-${BUILD_TARGET}/src/qt/qrc_dash_locale.cpp"`
`33`	`33`	`)`
`34`	`34`
`35`		`-# Delete directories we don't need`
	`35`	`+# Delete what we don't need`
`36`	`36`	`for target in "${TARGETS[@]}"`
`37`	`37`	`do`
`38`	`38`	`if [[ -d "${target}" ]] \|\| [[ -f "${target}" ]]; then`