From 7a41241e8e7c79d070fd569e5ae829447d8de7da Mon Sep 17 00:00:00 2001 From: takashiski Date: Mon, 13 Sep 2021 16:58:10 +0900 Subject: [PATCH 01/11] =?UTF-8?q?node-ffi-napi=E3=81=AE=E3=83=93=E3=83=AB?= =?UTF-8?q?=E3=83=89=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=E3=81=9F?= =?UTF-8?q?=E3=82=81=E3=81=ABapt=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 585bfc5..693a9b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmbedtls12 \ libmbedx509-0 \ git \ + gcc \ + make \ + python3 \ + python3-pip \ && rm -rf /var/lib/apt/lists/* # install neko, which is a dependency of haxelib From de3f18470a1331238b5e95d3643e42161eef49d8 Mon Sep 17 00:00:00 2001 From: takashiski Date: Mon, 13 Sep 2021 17:30:29 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E3=81=ABnode-ffi-napi?= =?UTF-8?q?=E3=81=AE=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit haxeとnekoのビルドで削除されちゃうようなので末尾に追加 --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 693a9b0..544aed1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,10 +22,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmbedtls12 \ libmbedx509-0 \ git \ - gcc \ - make \ - python3 \ - python3-pip \ && rm -rf /var/lib/apt/lists/* # install neko, which is a dependency of haxelib @@ -116,4 +112,11 @@ RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \ && apt-get install -y nodejs \ && npm install -g yarn +RUN apt-get update && apt-get install -y --no-install-recommends \ + make \ + gcc \ + python3 \ + python3-pip \ + && rm -rf /var/lib/apt/lists/* + CMD ["haxe"] From cf4f15620e14075558a7ed138265dfd45ac7e10f Mon Sep 17 00:00:00 2001 From: takashiski Date: Mon, 13 Sep 2021 17:49:34 +0900 Subject: [PATCH 03/11] =?UTF-8?q?limits.h=E3=81=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=81=AE=E3=81=9F=E3=82=81=E3=81=ABlinux-lib?= =?UTF-8?q?c-dev=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 544aed1..ad117d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,6 +117,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gcc \ python3 \ python3-pip \ + linux-libc-dev \ && rm -rf /var/lib/apt/lists/* CMD ["haxe"] From e85a2292a553be4c74859466d2bc4e3bbadf7056 Mon Sep 17 00:00:00 2001 From: takashiski Date: Tue, 14 Sep 2021 11:31:14 +0900 Subject: [PATCH 04/11] =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AA=E4=BE=9D?= =?UTF-8?q?=E5=AD=98=E9=96=A2=E4=BF=82=E3=82=92=E6=8E=A2=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad117d7..f95cb7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -114,10 +114,19 @@ RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \ RUN apt-get update && apt-get install -y --no-install-recommends \ make \ - gcc \ - python3 \ - python3-pip \ - linux-libc-dev \ + # gcc \ + g++ \ + # python3 \ + # python3-pip \ + # linux-libc-dev \ + libc6-dev \ && rm -rf /var/lib/apt/lists/* +RUN npm init -y\ + && npm install -S \ + ffi-napi \ + jimp \ + pixelmatch \ + ref-napi \ + ref-struct-napi CMD ["haxe"] From 9f510034df057e8c2f9b4de943aa7f0a92d16870 Mon Sep 17 00:00:00 2001 From: takashiski Date: Tue, 14 Sep 2021 11:31:31 +0900 Subject: [PATCH 05/11] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E9=83=A8=E5=88=86?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index f95cb7f..9268805 100644 --- a/Dockerfile +++ b/Dockerfile @@ -114,19 +114,8 @@ RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \ RUN apt-get update && apt-get install -y --no-install-recommends \ make \ - # gcc \ g++ \ - # python3 \ - # python3-pip \ - # linux-libc-dev \ libc6-dev \ && rm -rf /var/lib/apt/lists/* -RUN npm init -y\ - && npm install -S \ - ffi-napi \ - jimp \ - pixelmatch \ - ref-napi \ - ref-struct-napi CMD ["haxe"] From 94cebcc53f3ac1612ab1029648d0abb316e62015 Mon Sep 17 00:00:00 2001 From: takashiski Date: Tue, 14 Sep 2021 16:40:26 +0900 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82?= =?UTF-8?q?=E3=82=92=E3=82=B0=E3=83=AD=E3=83=BC=E3=83=90=E3=83=AB=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9268805..de1d135 100644 --- a/Dockerfile +++ b/Dockerfile @@ -116,6 +116,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ make \ g++ \ libc6-dev \ + bash \ && rm -rf /var/lib/apt/lists/* +RUN npm -g install -y \ + ffi-napi \ + jimp \ + pixelmatch \ + ref-napi \ + ref-struct-napi + CMD ["haxe"] From fcff295b4ade742e4d52b8acb525d736661bee4d Mon Sep 17 00:00:00 2001 From: takashiski Date: Tue, 14 Sep 2021 17:00:55 +0900 Subject: [PATCH 07/11] add unsafe-perm --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index de1d135..74926bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ bash \ && rm -rf /var/lib/apt/lists/* -RUN npm -g install -y \ +RUN npm -g install -y --unsafe-perm\ ffi-napi \ jimp \ pixelmatch \ From 384581e3674c746411f44d9ab9e673caed5b4824 Mon Sep 17 00:00:00 2001 From: takashiski Date: Tue, 14 Sep 2021 17:34:19 +0900 Subject: [PATCH 08/11] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 59ab970..6f8690b 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -12,6 +12,7 @@ on: tags: [ 'v*.*.*' ] pull_request: branches: [ master ] + tags: ["test"] env: # Use docker.io for Docker Hub if empty @@ -56,6 +57,7 @@ jobs: uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: context: . - push: ${{ github.event_name != 'pull_request' }} +# push: ${{ github.event_name != 'pull_request' }} + push: ${{github.event_name}} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 087527d69838e1b56c4ffcfd31e73747391cc9b2 Mon Sep 17 00:00:00 2001 From: takashiski Date: Tue, 14 Sep 2021 17:35:09 +0900 Subject: [PATCH 09/11] remove bash --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 74926bf..c66c0ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -116,7 +116,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ make \ g++ \ libc6-dev \ - bash \ && rm -rf /var/lib/apt/lists/* RUN npm -g install -y --unsafe-perm\ From 4be6da992e7e0b934facacea56ef5b8a88022951 Mon Sep 17 00:00:00 2001 From: takashiski Date: Wed, 15 Sep 2021 11:06:27 +0900 Subject: [PATCH 10/11] =?UTF-8?q?=E3=82=BF=E3=82=B0=E3=81=A4=E3=81=91?= =?UTF-8?q?=E3=81=A6=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 59ab970..b5ba5a5 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -12,6 +12,7 @@ on: tags: [ 'v*.*.*' ] pull_request: branches: [ master ] + tags: ["test"] env: # Use docker.io for Docker Hub if empty From dd1df2d7dac4893cc0ef751454a251e840ea893c Mon Sep 17 00:00:00 2001 From: takashiski Date: Wed, 15 Sep 2021 11:09:45 +0900 Subject: [PATCH 11/11] =?UTF-8?q?=E3=83=97=E3=83=AB=E3=83=AA=E3=82=AF?= =?UTF-8?q?=E3=82=A8=E3=82=B9=E3=83=88=E3=81=8Cpush=E5=AF=BE=E8=B1=A1?= =?UTF-8?q?=E5=A4=96=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=82=92=E5=A4=96=E3=81=97=E3=81=A6=E3=81=BF=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index b5ba5a5..b031484 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -57,6 +57,6 @@ jobs: uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: context: . - push: ${{ github.event_name != 'pull_request' }} + push: ${{ github.event_name }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }}