From 7cfbcb326618030bf895967c4c65cc981fc57743 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Tue, 22 Nov 2022 09:56:26 +0900 Subject: [PATCH 1/2] =?UTF-8?q?GPG=20=E3=81=AE=20Warning=20=E3=81=A7=20doc?= =?UTF-8?q?ker=20build=20=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dockerbuild.yml | 4 ++++ Dockerfile | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 1923e68431..21d1ff173a 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -31,21 +31,25 @@ jobs: echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV} echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.4 }} run: | echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} - name: Checkout uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 957eb64f3f..68ac3bce56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ FROM php:${TAG} ARG GD_OPTIONS="--with-freetype --with-jpeg" ARG EXT_INSTALL_ARGS="gd zip mysqli pgsql opcache" ARG APCU="apcu" +ARG FORCE_YES="--force-yes" # See https://github.com/debuerreotype/debuerreotype/issues/10 RUN if [ ! -d /usr/share/man/man1 ]; then mkdir /usr/share/man/man1; fi RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi @@ -14,7 +15,7 @@ RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi # ext-zip: libzip-dev zlib1g-dev # ext-opcache: libpcre3-dev RUN apt-get update \ - && apt-get install -y \ + && apt-get install -y ${FORCE_YES} \ git unzip curl apt-transport-https gnupg wget ca-certificates bc \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ libpq-dev \ From 342c02a906640facf3e2e7d54299491cd4cfaeb4 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Tue, 22 Nov 2022 10:03:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?on.push.branches:=20master=20=E3=81=AB?= =?UTF-8?q?=E9=99=90=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - dependabot でビルドされるイメージは不要なため --- .github/workflows/dockerbuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 21d1ff173a..da7b700839 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -1,6 +1,8 @@ name: Testing dockerbuild on: push: + branches: + - "master" paths: - '**' - '!*.md'