From f9c9dbd425cb313df989c0dfab398d5c41ec9077 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 7 Oct 2022 11:50:32 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=82=A4=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E5=90=8D=E3=82=92=20ec-cube/ec-cube2-php=20=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dockerbuild.yml | 10 ++++++++-- docker-compose.yml | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 3cc96b2f97..5982947394 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -32,7 +32,7 @@ jobs: steps: - name: downcase REPO run: | - echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV} + echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}-php" >> ${GITHUB_ENV} - if: ${{ matrix.php == 5.4 }} run: | @@ -78,9 +78,15 @@ jobs: uses: docker/metadata-action@v4 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + # set latest tag for default branch + type=raw,value=${{ matrix.php }}-apache,enable={{is_default_branch}} + type=ref,event=branch + type=ref,event=tag + type=ref,event=pr flavor: | latest=auto - suffix=-php-${{ matrix.php }}-apache + prefix=${{ matrix.php }}-apache- - name: Build and export to Docker uses: docker/build-push-action@v3 diff --git a/docker-compose.yml b/docker-compose.yml index beca8b0bfe..0ad70be970 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,8 +16,8 @@ services: ec-cube: ### ローカルでビルドする場合は以下のコマンドを使用します ## docker build -t ec-cube2 --no-cache --pull --build-arg TAG=8.1-apache . - ## docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2:master-php-8.1-apache - image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube2}:${TAG:-master-php-8.1-apache} + ## docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2-php:8.1-apache + image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube2-php}:${TAG:-8.1-apache} build: context: . volumes: From 6c178ac7ee962bdc3e57fcdbb3e7cb7365293ba8 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 7 Oct 2022 11:50:32 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=A4=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E5=90=8D=E3=82=92=20ec-cube/ec-cube2-php=20=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dockerbuild.yml | 29 +++++++++++++++++------------ docker-compose.yml | 4 ++-- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 3cc96b2f97..154f9092f5 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -1,17 +1,17 @@ name: Testing dockerbuild on: push: + branches: + - '*' + tags: + - '*' paths: - - 'Dockerfile' - - 'dockerbuild/*' - - 'docker-compose*.yml' - - '.github/workflows/dockerbuild.yml' + - '**' + - '!*.md' pull_request: paths: - - 'Dockerfile' - - 'dockerbuild/*' - - 'docker-compose*.yml' - - '.github/workflows/dockerbuild.yml' + - '**' + - '!*.md' release: types: [ published ] env: @@ -32,7 +32,7 @@ jobs: steps: - name: downcase REPO run: | - echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV} + echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}-php" >> ${GITHUB_ENV} - if: ${{ matrix.php == 5.4 }} run: | @@ -78,9 +78,14 @@ jobs: uses: docker/metadata-action@v4 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - flavor: | - latest=auto - suffix=-php-${{ matrix.php }}-apache + tags: | + # set latest tag for default branch + type=raw,value=${{ matrix.php }}-apache,prefix=,enable={{is_default_branch}} + type=ref,event=branch,prefix=${{ matrix.php }}-apache- + type=ref,event=tag,prefix=${{ matrix.php }}-apache- + type=ref,event=pr,prefix=${{ matrix.php }}-apache-pr- + type=match,prefix=${{ matrix.php }}-apache-,pattern=eccube-(.*),group=1 + type=match,prefix=${{ matrix.php }}-apache-,pattern=eccube2-weekly-(.*),group=1 - name: Build and export to Docker uses: docker/build-push-action@v3 diff --git a/docker-compose.yml b/docker-compose.yml index beca8b0bfe..0ad70be970 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,8 +16,8 @@ services: ec-cube: ### ローカルでビルドする場合は以下のコマンドを使用します ## docker build -t ec-cube2 --no-cache --pull --build-arg TAG=8.1-apache . - ## docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2:master-php-8.1-apache - image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube2}:${TAG:-master-php-8.1-apache} + ## docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2-php:8.1-apache + image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube2-php}:${TAG:-8.1-apache} build: context: . volumes: From 02768643291f28f2cb894bf9218f111dc1d98d86 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 30 Nov 2022 17:08:52 +0000 Subject: [PATCH 3/3] fix: upgrade webpack from 5.74.0 to 5.75.0 Snyk has created this PR to upgrade webpack from 5.74.0 to 5.75.0. See this package in npm: https://www.npmjs.com/package/webpack See this project in Snyk: https://app.snyk.io/org/nanasess/project/03efa96d-eda1-4d35-adc4-03e2cb2ac671?utm_source=github&utm_medium=referral&page=upgrade-pr --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f4457daca8..5eeccab907 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "slick-carousel": "^1.8.1", "style-loader": "^3.3.0", "url-loader": "^4.1.1", - "webpack": "^5.73.0" + "webpack": "^5.75.0" }, "devDependencies": { "@babel/core": "^7.17.5",