From ab55d6d9df12db2096721effc6ccf9bf3e4b5860 Mon Sep 17 00:00:00 2001 From: Nicolas MARTEAU Date: Fri, 5 Jul 2024 10:36:49 +0200 Subject: [PATCH] chore(linuxmusl-x64): move Dockerfile in platform repository --- .github/workflows/build.yml | 2 +- {npm => platform}/linuxmusl-x64/Dockerfile | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) rename {npm => platform}/linuxmusl-x64/Dockerfile (78%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7bf7c1b..fa314a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: - name: Build with Docker (${{ matrix.platform }}) if: contains(matrix.os, 'ubuntu') run: | - docker build --build-arg PLATFORM=${{ matrix.platform }} --build-arg LIBHEIF_V=v1.17.6 -t test . -f ./platform/Dockerfile + docker build --build-arg PLATFORM=${{ matrix.platform }} --build-arg LIBHEIF_V=v1.17.6 -t ${{ matrix.platform }} . -f ./platform/Dockerfile docker run --name ${{ matrix.platform }} ${{ matrix.platform }} docker cp ${{ matrix.platform }}:/heif-converter/src/build/Release/converter.node ./release/converter.${{ matrix.platform }}.node docker container rm ${{ matrix.platform }} diff --git a/npm/linuxmusl-x64/Dockerfile b/platform/linuxmusl-x64/Dockerfile similarity index 78% rename from npm/linuxmusl-x64/Dockerfile rename to platform/linuxmusl-x64/Dockerfile index 4936f4a..4b283a8 100644 --- a/npm/linuxmusl-x64/Dockerfile +++ b/platform/linuxmusl-x64/Dockerfile @@ -1,4 +1,5 @@ FROM node:16-alpine +LABEL maintainer="Nicolas Marteau " ENV VCPKG_FORCE_SYSTEM_BINARIES 1 RUN apk --no-cache add \ @@ -34,15 +35,4 @@ RUN git clone https://github.com/ninja-build/ninja.git /tmp/ninja \ RUN git clone https://github.com/microsoft/vcpkg.git && \ ./vcpkg/bootstrap-vcpkg.sh && \ - ./vcpkg/vcpkg install libheif - -WORKDIR heif-converter - -COPY . . - -RUN npm install -g node-gyp && \ - npm install && \ - node-gyp configure -C src && \ - node-gyp build -C src - -CMD ["/bin/sh"] \ No newline at end of file + ./vcpkg/vcpkg install libheif \ No newline at end of file