woohoo?

Author: baileympearson

.evergreen/docker/Dockerfile.musl

@@ -19,17 +19,3 @@ EOF
 ARG DRIVERS_TOOLS=drivers-evergreen-tools
 WORKDIR ${DRIVERS_TOOLS}
 RUN git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git .
-
-# TODO: remove this cloning once we have an official release of FLE
-WORKDIR /mongodb-client-encryption
-RUN <<EOF
-git clone https://github.com/baileympearson/mongodb-client-encryption.git .
-cd mongodb-client-encryption
-git switch alpine
-npm run install:libmongocrypt
-EOF
-
-# TODO: don't copy in current dir, instead mount it as a volume at runtime.
-WORKDIR /node-mongodb-native
-COPY . .
-RUN npm install ../mongodb-client-encryption

.evergreen/docker/alpine.sh

@@ -15,10 +15,6 @@ IMAGE_TAG=${IMAGE_TAG:-alpine-fle-image}
 build_alpine() {
     docker buildx create --name builder --bootstrap --use
 
-    # set up FLE creds on host.  don't download cryptd because we don't need it.
-    # TODO: once we map cwd onto the host, we don't need to build the image with the credential file present.
-    RUN_WITH_MONGOCRYPTD=true bash .evergreen/setup-fle.sh
-
     BASE_TAG=$LINUX_ARCH-alpine-base-node-$NODE_VERSION
     docker --debug buildx build --load --progress=plain \
         --platform linux/$LINUX_ARCH \
@@ -30,14 +26,18 @@ build_alpine() {
 }
 
 test_alpine() {
-    # launch a mongocryptd on the host.
+    # set up FLE creds on host.  don't download cryptd because we don't need it.
+    RUN_WITH_MONGOCRYPTD=true bash .evergreen/setup-fle.sh
+
+    # # launch a mongocryptd on the host.
     ./mongodb/bin/mongocryptd --fork --port 3000 --pidfilepath $(pwd)/pid.file --logpath $(pwd)/logpath
     MONGOCRYPTD_URI='mongodb://localhost:3000'
 
-    # run FLE tests in container, using mongocryptd and replica set running on host
+    # # run FLE tests in container, using mongocryptd and replica set running on host
     docker --debug run \
         --platform linux/$LINUX_ARCH \
         -e MONGODB_URI=${MONGODB_URI} -e MONGOCRYPTD_URI=${MONGOCRYPTD_URI} \
+        --volume $(pwd):/node-mongodb-native -w /node-mongodb-native \
         --network host \
         --entrypoint bash \
         $IMAGE_TAG \

.evergreen/run-alpine-fle-tests.sh

@@ -1,5 +1,6 @@
 #! /usr/bin/env bash
 
+npm i
 source secrets-export.sh
 
 export ALPINE=true

package-lock.json

@@ -96,7 +96,7 @@
     "js-yaml": "^4.1.0",
     "mocha": "^10.8.2",
     "mocha-sinon": "^2.1.2",
-    "mongodb-client-encryption": "^6.1.1",
+    "mongodb-client-encryption": "^6.2.0",
     "mongodb-legacy": "^6.1.3",
     "nyc": "^15.1.0",
     "prettier": "^3.4.2",