...test?

Author: baileympearson

.github/docker/Dockerfile.glibc

@@ -11,13 +11,11 @@ ENV PATH=$PATH:/nodejs/bin
 WORKDIR /mongodb-client-encryption
 COPY . .
 
-RUN apt-get -qq update && apt-get -qq install -y python3 build-essential git && ldd --version
+RUN apt-get -qq update && apt-get -qq install -y build-essential curl git && ldd --version
 
-RUN npm run install:libmongocrypt
-
-ARG RUN_TEST
-RUN if [ -n "$RUN_TEST" ]; then npm test ; else echo "skipping tests" ; fi
-
-FROM scratch
-
-COPY --from=build /mongodb-client-encryption/prebuilds/ /
+RUN bash install-pyenv.sh
+RUN pyenv install 3.10 && pyenv global 3.10
+RUN python --version
+RUN git --version
+RUN c++ --version
+RUN g++ --version

.github/docker/Dockerfile.musl

@@ -1,18 +1,11 @@
-ARG PLATFORM=arm64
+ARG ARCH=arm64
 ARG NODE_VERSION=16.20.1
 
-FROM ${PLATFORM}/node:${NODE_VERSION}-alpine AS build
-
-WORKDIR /mongodb-client-encryption
-COPY . .
+FROM ${ARCH}/node:${NODE_VERSION}-alpine AS dependencies
 
 RUN apk --no-cache add make g++ libc-dev curl bash python3 py3-pip cmake git
-RUN npm run install:libmongocrypt
-RUN npm run prebuild
-
-ARG RUN_TEST
-RUN if [ -n "$RUN_TEST" ]; then npm test ; else echo "skipping tests" ; fi
-
-FROM scratch
 
-COPY --from=build /mongodb-client-encryption/prebuilds/ /
+RUN python3 --version
+RUN git --version
+RUN c++ --version
+RUN g++ --version

.github/docker/Test.dockerfile

@@ -0,0 +1,9 @@
+ARG ARCH
+ARG NODE_VERSION
+FROM ${ARCH}-alpine-base-node-${NODE_VERSION}:latest
+
+WORKDIR /mongodb-client-encryption
+COPY . .
+
+RUN npm install --ignore-scripts
+RUN npm run install:libmongocrypt -- --skip-bindings

.github/workflows/test.yml

@@ -109,14 +109,29 @@ jobs:
           version: v0.18.0
           driver-opts: image=moby/buildkit:v0.17.2
 
+      - name: Init builder
+        run: docker buildx create --name builder --bootstrap --use
+
       - name: Run Buildx
         run: |
-          docker buildx create --name builder --bootstrap --use
+          ARCH=${{ matrix.linux_arch == 'arm64' && 'arm64v8' || matrix.linux_arch }}
+          NODE_VERSION=${{ steps.get_nodejs_version.outputs.version }}
+          TAG=$ARCH-alpine-lib-base-node-$NODE_VERSION
           docker --debug buildx build --progress=plain --no-cache \
             --platform linux/${{ matrix.linux_arch }} \
-            --build-arg="PLATFORM=${{ matrix.linux_arch == 'arm64' && 'arm64v8' || matrix.linux_arch }}" \
+            --build-arg="ARCH=$ARCH" \
             --build-arg="NODE_VERSION=${{ steps.get_nodejs_version.outputs.version }}" \
-            --build-arg="RUN_TEST=true" \
-            --output type=local,dest=./prebuilds,platform-split=false \
+            --output type=oci,dest=alpine-node-base,platform-split=false \
             -f ./.github/docker/Dockerfile.musl \
-            .
+            -t $ARCH-alpine-lib-base-node-$NODE_VERSION
+            .
+
+      - id: upload
+        name: Upload prebuild
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.linux_arch == 'arm64' && 'arm64v8' || matrix.linux_arch }}-alpine-lib-base-node-${{ steps.get_nodejs_version.outputs.version }}
+          path: alpine-node-base
+          if-no-files-found: 'error'
+          retention-days: 30
+          compression-level: 0

etc/docker.sh

@@ -13,15 +13,28 @@ NODE_VERSION=20.0.0
 SCRIPT_DIR=$(dirname ${BASH_SOURCE:-$0})
 PROJECT_DIR=$SCRIPT_DIR/..
 
+# set -o xtrace
+
 build_and_test_musl() {
     docker buildx create --name builder --bootstrap --use
 
-    docker --debug buildx build --load --progress=plain --no-cache \
-        --platform linux/$LINUX_ARCH --output=type=docker \
+    BASE_TAG=$LINUX_ARCH-alpine-base-node-$NODE_VERSION
+    docker --debug buildx build --progress=plain \
+        --platform linux/$LINUX_ARCH --output=type=oci,dest=alpine-lib-base \
         --build-arg="PLATFORM=$LINUX_ARCH" \
         --build-arg="NODE_VERSION=$NODE_VERSION" \
         --build-arg="RUN_TEST=true" \
-        -f ./.github/docker/Dockerfile.musl -t musl-zstd-base \
+        -f ./.github/docker/Dockerfile.musl -t $BASE_TAG \
+        .
+
+    cat alpine-lib-base | docker load
+
+    LIBMONGOCRYPT_TAG=$LINUX_ARCH-alpine-libmongocrypt-node-$NODE_VERSION
+    docker --debug buildx build --progress=plain --pull=false --no-cache \
+        --platform linux/$LINUX_ARCH --load \
+        --build-arg="ARCH=$LINUX_ARCH" \
+        --build-arg="NODE_VERSION=$NODE_VERSION" \
+        -f ./.github/docker/Test.dockerfile -t $LIBMONGOCRYPT_TAG \
         .
 }
 
@@ -42,5 +55,5 @@ build_and_test_glibc() {
         $PROJECT_DIR
 }
 
-build_and_test_musl
+# build_and_test_musl
 # build_and_test_glibc