Skip to content

Commit f2e47fc

Browse files
committed
chore(NODE-6237): build against glibc 2.27
1 parent ea1f4a6 commit f2e47fc

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.github/docker/Dockerfile.glibc

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
ARG NODE_BUILD_IMAGE=node:16.20.1-bullseye
2-
FROM $NODE_BUILD_IMAGE AS build
1+
FROM ubuntu:bionic AS build
2+
3+
# Possible values: s390x, arm64, x64
4+
ARG NODE_ARCH
5+
ADD https://nodejs.org/dist/v16.20.1/node-v16.20.1-linux-${NODE_ARCH}.tar.gz /
6+
RUN mkdir -p /nodejs && tar -xzf /node-v16.20.1-linux-${NODE_ARCH}.tar.gz --strip-components=1 -C /nodejs
7+
ENV PATH=$PATH:/nodejs/bin
38

49
WORKDIR /mongodb-client-encryption
510
COPY . .
611

7-
RUN npm run install:libmongocrypt
8-
RUN npm run test
12+
RUN apt-get -qq update && apt-get -qq install -y python3 build-essential && ldd --version
13+
14+
RUN npm run install:libmongocrypt && npm run test
915

1016
FROM scratch
1117

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Run Buildx
5959
run: |
6060
docker buildx create --name builder --bootstrap --use
61-
docker buildx build --platform linux/${{ matrix.linux_arch }} --output type=local,dest=./prebuilds,platform-split=false -f ./.github/docker/Dockerfile.glibc .
61+
docker buildx build --platform linux/${{ matrix.linux_arch }} --build-arg NODE_ARCH=${{ matrix.linux_arch == 'amd64' && 'x64' || matrix.linux_arch }} --output type=local,dest=./prebuilds,platform-split=false -f ./.github/docker/Dockerfile.glibc .
6262
6363
- id: upload
6464
name: Upload prebuild

test/release.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const REQUIRED_FILES = [
2222
];
2323

2424
describe(`Release ${packFile}`, function () {
25-
this.timeout(10000);
25+
this.timeout(60000);
2626

2727
beforeEach(function () {
2828
if (process.arch !== 'x64') {

0 commit comments

Comments
 (0)