From 3ec45a86e43f23626894389e3a924c52ec2e2a9f Mon Sep 17 00:00:00 2001 From: Andrew Basson Date: Mon, 14 Feb 2022 11:53:13 +0100 Subject: [PATCH 1/2] fix(docker): add deps for @vscode/sqlite3 The change to using @vscode/sqlite3 broke our deployment builds. Adding the required build tool `g++` and linking `python` to the python3 executable. ```shell make: Entering directory '/builds/.../node_modules/@vscode/sqlite3/build' ACTION deps_sqlite3_gyp_action_before_build_target_unpack_sqlite_dep Release/obj/gen/sqlite-autoconf-3360000/sqlite3.c /bin/sh: python: not found ``` Technically, the python path can be added to `.nmprc`, but added it to the docker file instead. Signed-off-by: Andrew Basson --- contrib/docker/devops/Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/docker/devops/Dockerfile b/contrib/docker/devops/Dockerfile index 9bb80a0a2c..c328b06b79 100644 --- a/contrib/docker/devops/Dockerfile +++ b/contrib/docker/devops/Dockerfile @@ -9,7 +9,8 @@ WORKDIR /tmp # update package sources # `--virtual` is used to enable removal of these dependencies as a named group -# - python: required by node-gyp +# - python3: required by node-gyp +# - g++: reuwired to build @vscode/sqlite3 # - pixman: required by node-canvas # - pkgconfig: required by pixman # -------------------------------------------- @@ -32,7 +33,8 @@ WORKDIR /tmp RUN apk update \ && apk add --no-cache \ --virtual ${APK_VIRTUAL_NAME} \ - python \ + python3 \ + g++ \ pixman \ pkgconfig \ alpine-sdk \ @@ -51,6 +53,10 @@ RUN wget -qO- ${VALE_INSTALL_URL} \ | tar xvz -C /bin vale \ && chmod +x /bin/vale +# needed for sqlite3 build that needs python +RUN ln -s /usr/bin/python3 /usr/bin/python && \ + ln -s /usr/bin/pip3 /usr/bin/pip + RUN mkdir /app WORKDIR /app From 1c95de39e33db81f0c7e7885093ed653152006b8 Mon Sep 17 00:00:00 2001 From: Andrew Basson Date: Mon, 14 Feb 2022 16:24:01 +0100 Subject: [PATCH 2/2] chore(contrib/docker/devops): fix docs typos Signed-off-by: Andrew Basson Co-authored-by: Johan Haals --- contrib/docker/devops/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/devops/Dockerfile b/contrib/docker/devops/Dockerfile index c328b06b79..a7c194618a 100644 --- a/contrib/docker/devops/Dockerfile +++ b/contrib/docker/devops/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /tmp # update package sources # `--virtual` is used to enable removal of these dependencies as a named group # - python3: required by node-gyp -# - g++: reuwired to build @vscode/sqlite3 +# - g++: required to build @vscode/sqlite3 # - pixman: required by node-canvas # - pkgconfig: required by pixman # --------------------------------------------