From 24a0f5ef12692d6a4201e90904bd27b2021a3597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 18 Jan 2023 11:12:19 +0100 Subject: [PATCH 1/7] Fix npm link usage at build --- Dockerfile_mbtci_template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile_mbtci_template b/Dockerfile_mbtci_template index 70892f27..dfe315cc 100644 --- a/Dockerfile_mbtci_template +++ b/Dockerfile_mbtci_template @@ -87,6 +87,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ | sort -u \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # for npm link + && chown -R ${USER}:${USER} /usr/local/lib/node_modules \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && echo "node ${NODE_VERSION} install smoke tests!" \ @@ -214,4 +216,4 @@ RUN set -ex \ ENV PATH=$PATH:./node_modules/.bin HOME=${MTA_USER_HOME} WORKDIR /project -USER ${MTA_USER} \ No newline at end of file +USER ${MTA_USER} From 7f5f1fdd8beb7fc8fbfea8b03dbfacb119906261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sun, 22 Jan 2023 19:11:56 +0100 Subject: [PATCH 2/7] Improve npm usage without sudo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- Dockerfile_mbtci_template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile_mbtci_template b/Dockerfile_mbtci_template index dfe315cc..1c512418 100644 --- a/Dockerfile_mbtci_template +++ b/Dockerfile_mbtci_template @@ -87,8 +87,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ | sort -u \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # for npm link - && chown -R ${USER}:${USER} /usr/local/lib/node_modules \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && echo "node ${NODE_VERSION} install smoke tests!" \ @@ -214,6 +212,12 @@ RUN set -ex \ && python2.7 --version \ && python3 --version +# Allow global npm packages install without sudo +RUN set -ex \ + && mkdir ${USER_HOME_DIR}/.npm-global \ + && chown ${USER}:${USER} ${USER_HOME_DIR}/.npm-global +ENV NPM_CONFIG_PREFIX ${USER_HOME_DIR}/.npm-global + ENV PATH=$PATH:./node_modules/.bin HOME=${MTA_USER_HOME} WORKDIR /project USER ${MTA_USER} From 9fa7ca9569ae0e002a0f129112e3d1690a71b066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Mon, 23 Jan 2023 12:39:06 +0100 Subject: [PATCH 3/7] Update Dockerfile_mbtci_template --- Dockerfile_mbtci_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile_mbtci_template b/Dockerfile_mbtci_template index 1c512418..57cf5432 100644 --- a/Dockerfile_mbtci_template +++ b/Dockerfile_mbtci_template @@ -215,7 +215,7 @@ RUN set -ex \ # Allow global npm packages install without sudo RUN set -ex \ && mkdir ${USER_HOME_DIR}/.npm-global \ - && chown ${USER}:${USER} ${USER_HOME_DIR}/.npm-global + && chown -R ${USER}:${USER} ${USER_HOME_DIR} ENV NPM_CONFIG_PREFIX ${USER_HOME_DIR}/.npm-global ENV PATH=$PATH:./node_modules/.bin HOME=${MTA_USER_HOME} From 68a9b750c25cb28b82d09522afd47433b07a6eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Mon, 23 Jan 2023 17:14:41 +0100 Subject: [PATCH 4/7] Fix variables name usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- Dockerfile_mbtci_template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile_mbtci_template b/Dockerfile_mbtci_template index 57cf5432..67fafb52 100644 --- a/Dockerfile_mbtci_template +++ b/Dockerfile_mbtci_template @@ -214,9 +214,9 @@ RUN set -ex \ # Allow global npm packages install without sudo RUN set -ex \ - && mkdir ${USER_HOME_DIR}/.npm-global \ - && chown -R ${USER}:${USER} ${USER_HOME_DIR} -ENV NPM_CONFIG_PREFIX ${USER_HOME_DIR}/.npm-global + && mkdir ${MTA_USER_HOME}/.npm-global \ + && chown -R ${MTA_USER}:${MTA_USER} ${MTA_USER_HOME} +ENV NPM_CONFIG_PREFIX ${MTA_USER_HOME}/.npm-global ENV PATH=$PATH:./node_modules/.bin HOME=${MTA_USER_HOME} WORKDIR /project From 8b3a2a0c7351e9933b8191a89027681addfbb95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Tue, 31 Jan 2023 16:12:21 +0100 Subject: [PATCH 5/7] Update Dockerfile_mbtci_template --- Dockerfile_mbtci_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile_mbtci_template b/Dockerfile_mbtci_template index 67fafb52..2f38199b 100644 --- a/Dockerfile_mbtci_template +++ b/Dockerfile_mbtci_template @@ -218,6 +218,6 @@ RUN set -ex \ && chown -R ${MTA_USER}:${MTA_USER} ${MTA_USER_HOME} ENV NPM_CONFIG_PREFIX ${MTA_USER_HOME}/.npm-global -ENV PATH=$PATH:./node_modules/.bin HOME=${MTA_USER_HOME} +ENV PATH=$PATH:./node_modules/.bin WORKDIR /project USER ${MTA_USER} From 31f6cb192af4662220c7bcd0bae562de5711acae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Thu, 2 Feb 2023 15:50:49 +0100 Subject: [PATCH 6/7] Update Dockerfile_mbtci_template --- Dockerfile_mbtci_template | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile_mbtci_template b/Dockerfile_mbtci_template index 2f38199b..c595397a 100644 --- a/Dockerfile_mbtci_template +++ b/Dockerfile_mbtci_template @@ -215,6 +215,7 @@ RUN set -ex \ # Allow global npm packages install without sudo RUN set -ex \ && mkdir ${MTA_USER_HOME}/.npm-global \ + && mkdir ${MTA_USER_HOME}/.npm-global/lib \ && chown -R ${MTA_USER}:${MTA_USER} ${MTA_USER_HOME} ENV NPM_CONFIG_PREFIX ${MTA_USER_HOME}/.npm-global From 14f578f1966d0e3824dadbf28cd0af8879e77049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Tue, 7 Feb 2023 15:13:35 +0100 Subject: [PATCH 7/7] Fix mismerge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- Dockerfile_mbtci_template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile_mbtci_template b/Dockerfile_mbtci_template index d56f44d2..b4c248f3 100644 --- a/Dockerfile_mbtci_template +++ b/Dockerfile_mbtci_template @@ -15,7 +15,6 @@ ENV PYTHON /usr/bin/python3 ENV JAVA_HOME /opt/jdk ENV MAVEN_HOME /usr/share/maven ENV M2_HOME ${MAVEN_HOME} -ENV PATH /usr/local/go/bin:$PATH ENV CGO_ENABLED=0 ENV GOOS=linux ENV DEBIAN_FRONTEND=noninteractive @@ -248,6 +247,6 @@ RUN set -ex \ && chown -R ${MTA_USER}:${MTA_USER} ${MTA_USER_HOME} ENV NPM_CONFIG_PREFIX ${MTA_USER_HOME}/.npm-global -ENV PATH=$PATH:./node_modules/.bin +ENV PATH=$PATH:./node_modules/.bin:${MTA_USER_HOME}/.npm-global/bin WORKDIR /project USER ${MTA_USER}