From b9773b061eb85cd78ec302a157aa96c780d12415 Mon Sep 17 00:00:00 2001 From: Dalton Verhagen Date: Tue, 14 Nov 2023 20:26:19 +0000 Subject: [PATCH 1/2] Fix devcontainer Dockerfile typo (fixes #3114) There was a small typo with the name of the requirements.txt file that prevented the whole image from being built. --- .devcontainer/Dockerfile | 2 +- CHANGELOG.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a79249f3c2e..ef43fb2773c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -10,7 +10,7 @@ RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/ # [Optional] If your pip requirements rarely change, uncomment this section to add them to the image. COPY .config/python/dev/requirements.txt /tmp/pip-tmp/ -RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.dev.txt \ +RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \ && rm -rf /tmp/pip-tmp RUN npm install markdown-table-formatter -g diff --git a/CHANGELOG.md b/CHANGELOG.md index cb64c391761..21d326c9aab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l - Fixes - Fix issue Gitleaks `--no-git` does not work anymore, [#2945](https://github.com/oxsecurity/megalinter/issues/2945), in [PR 3112](https://github.com/oxsecurity/megalinter/pull/3112) + - Fix issue with VS Code devcontainer not building [#3114](https://github.com/oxsecurity/megalinter/issues/3114) - CI - Upgrade pymdown-extensions and markdown, by @BryanQuigley in [#3053](https://github.com/oxsecurity/megalinter/pull/3053) From a3bb841b4e71db755ecb920110062ac61d8d424d Mon Sep 17 00:00:00 2001 From: Dalton Verhagen Date: Wed, 15 Nov 2023 13:48:22 +0100 Subject: [PATCH 2/2] Remove outdated comment from devcontainer Dockerfile This comment is no longer relvant and will just confure users. --- .devcontainer/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ef43fb2773c..2c6813ed9e9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -8,7 +8,6 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT} ARG NODE_VERSION="16" RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi -# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image. COPY .config/python/dev/requirements.txt /tmp/pip-tmp/ RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \ && rm -rf /tmp/pip-tmp