Skip to content

Commit fa782f4

Browse files
asdf
1 parent cb54bcd commit fa782f4

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

.evergreen/docker/Dockerfile.musl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ RUN git --version
1010
RUN c++ --version
1111
RUN g++ --version
1212

13+
ARG DRIVERS_TOOLS=drivers-evergreen-tools
14+
WORKDIR ${DRIVERS_TOOLS}
15+
RUN git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git .
16+
1317
RUN git clone https://github.com/baileympearson/mongodb-client-encryption.git && cd mongodb-client-encryption && git switch alpine && npm run install:libmongocrypt
1418

1519
WORKDIR /node-mongodb-native
1620
COPY . .
1721
RUN npm install ../mongodb-client-encryption
18-
19-
# RUN echo "host.docker.internal localhost" >>/etc/hosts

etc/docker.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ build_and_test_glibc() {
7474

7575
docker buildx create --name builder --bootstrap --use
7676

77-
bash .evergreen/setup-fle.sh
77+
RUN_WITH_MONGOCRYPTD=true bash .evergreen/setup-fle.sh
7878

7979
./mongodb/bin/mongocryptd --fork --port 3000 --pidfilepath $(pwd)/pid.file --logpath $(pwd)/logpath
8080

@@ -83,14 +83,9 @@ docker --debug buildx build --load --progress=plain \
8383
--platform linux/$LINUX_ARCH \
8484
--build-arg="ARCH=$LINUX_ARCH" \
8585
--build-arg="NODE_VERSION=$NODE_VERSION" \
86-
--build-arg="RUN_TEST=true" \
86+
--build-arg="DRIVERS_TOOLS=$DRIVERS_TOOLS" \
8787
-f ./.evergreen/docker/Dockerfile.musl -t test-tag-1 \
8888
.
8989

90-
# MONGODB_URI=$(echo $MONGODB_URI | sed 's/127.0.0.1/host.docker.internal/g')
91-
92-
# set -o xtrace
93-
# # echo "launching process"
94-
9590
docker --debug run --platform linux/$LINUX_ARCH -e MONGODB_URI=${MONGODB_URI} --network host --entrypoint bash test-tag-1 '.evergreen/run-alpine-fle-tests.sh'
9691
# docker --debug run --network host --platform linux/$LINUX_ARCH -e MONGODB_URI=$MONGODB_URI --entrypoint bash -ti test-tag-1

0 commit comments

Comments
 (0)