From a68281492a86909e6deada3490e87fd7d25055fb Mon Sep 17 00:00:00 2001 From: Nicolas MARTEAU Date: Tue, 13 Aug 2024 10:11:56 +0200 Subject: [PATCH] refactor: remove node installation in Dockerfile --- .github/workflows/build-lib-c-binaries.yml | 2 +- LIBHEIF_VERSION | 1 - platform/linux-x64/Dockerfile | 3 --- platform/win32-ia32/Dockerfile | 1 - platform/win32-x64/Dockerfile | 1 - 5 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 LIBHEIF_VERSION diff --git a/.github/workflows/build-lib-c-binaries.yml b/.github/workflows/build-lib-c-binaries.yml index a4221a2..c046ce5 100644 --- a/.github/workflows/build-lib-c-binaries.yml +++ b/.github/workflows/build-lib-c-binaries.yml @@ -96,7 +96,7 @@ jobs: tar -czf ${{ matrix.platform }}.tar.gz * - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: binaries path: ./binaries/${{ matrix.platform }}.tar.gz \ No newline at end of file diff --git a/LIBHEIF_VERSION b/LIBHEIF_VERSION deleted file mode 100644 index 80be489..0000000 --- a/LIBHEIF_VERSION +++ /dev/null @@ -1 +0,0 @@ -1.17.6 \ No newline at end of file diff --git a/platform/linux-x64/Dockerfile b/platform/linux-x64/Dockerfile index 0d55e3a..96a95b5 100644 --- a/platform/linux-x64/Dockerfile +++ b/platform/linux-x64/Dockerfile @@ -18,9 +18,6 @@ RUN apt-get update && \ python3-mako \ && rm -rf /var/lib/apt/lists/* -RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && \ - apt-get install -y nodejs - RUN git clone https://github.com/microsoft/vcpkg.git && \ ./vcpkg/bootstrap-vcpkg.sh && \ ./vcpkg/vcpkg install libheif \ No newline at end of file diff --git a/platform/win32-ia32/Dockerfile b/platform/win32-ia32/Dockerfile index a2810b3..f4f147d 100644 --- a/platform/win32-ia32/Dockerfile +++ b/platform/win32-ia32/Dockerfile @@ -6,7 +6,6 @@ RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; \ iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" -RUN choco install -y nodejs --version=20.9.0 --x86 RUN choco install -y git visualstudio2019buildtools visualstudio2019-workload-vctools RUN choco install -y python3 diff --git a/platform/win32-x64/Dockerfile b/platform/win32-x64/Dockerfile index 04effdf..be94544 100644 --- a/platform/win32-x64/Dockerfile +++ b/platform/win32-x64/Dockerfile @@ -6,7 +6,6 @@ RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; \ iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" -RUN choco install -y nodejs --version=20.9.0 RUN choco install -y git visualstudio2019buildtools visualstudio2019-workload-vctools RUN choco install -y python3