diff --git a/package-lock.json b/package-lock.json index 527c35db5c..b5579deab6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4535,9 +4535,9 @@ "dev": true }, "boxednode": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/boxednode/-/boxednode-1.2.3.tgz", - "integrity": "sha512-Fi/ThgA1v2gqTJ2GWCHvsl7eN6SbY9B++U34U7xaN2jHqCtNi8vJqI9RFXF8woqejoQ/PRg1vtgmqgKlk0OQEQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/boxednode/-/boxednode-1.3.0.tgz", + "integrity": "sha512-XD5ziGB1uIATkltyxXavc1dKO1yWIuRQNlH9JF64MfAod+0uiYPKqJOP40t+G0qvP+Joks0HItkJj3dUgf9yVQ==", "dev": true, "requires": { "chalk": "^4.1.0", diff --git a/package.json b/package.json index 496fa9bd4c..9ba84eab25 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "adm-zip": "^0.4.14", "aws-sdk": "^2.674.0", "axios": "^0.19.2", - "boxednode": "^1.2.3", + "boxednode": "^1.3.0", "browserify": "^16.5.0", "chai": "^4.2.0", "command-exists": "^1.2.9", diff --git a/packages/build/src/signable-compiler.ts b/packages/build/src/signable-compiler.ts index 2adb01662b..a8c976b230 100644 --- a/packages/build/src/signable-compiler.ts +++ b/packages/build/src/signable-compiler.ts @@ -33,7 +33,13 @@ class SignableCompiler { sourceFile: this.sourceFile, targetFile: this.targetFile, nodeVersionRange: this.nodeVersionRange, - namespace: 'mongosh' + namespace: 'mongosh', + env: { + ...process.env, + // Custom env vars for sccache: + AWS_ACCESS_KEY_ID: process.env.DEVTOOLS_CI_AWS_KEY, + AWS_SECRET_ACCESS_KEY: process.env.DEVTOOLS_CI_AWS_SECRET + } }); } } diff --git a/scripts/docker/ubuntu16.04-build.Dockerfile b/scripts/docker/ubuntu16.04-build.Dockerfile index 168bf41d28..433cdd367b 100644 --- a/scripts/docker/ubuntu16.04-build.Dockerfile +++ b/scripts/docker/ubuntu16.04-build.Dockerfile @@ -14,7 +14,10 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test RUN apt-get update RUN apt-get -y -qq install nodejs g++-6 rpm -ENV CC=gcc-6 -ENV CXX=g++-6 +# Add sccache +RUN curl -L https://github.com/mozilla/sccache/releases/download/0.2.13/sccache-0.2.13-x86_64-unknown-linux-musl.tar.gz | tar -C /usr/local/bin -xzvf - --strip=1 sccache-0.2.13-x86_64-unknown-linux-musl/sccache + +ENV CC="sccache gcc-6" +ENV CXX="sccache g++-6" ENTRYPOINT [ "bash" ]