From dbf4e16932656e38aac3327367a304c287f84f00 Mon Sep 17 00:00:00 2001 From: Jonas Staudenmeir Date: Fri, 26 Jan 2024 20:43:24 +0100 Subject: [PATCH] ci --- .github/workflows/ci.yml | 6 +++--- docker-compose.ci.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acee00a..1308c5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,15 +26,15 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - run: | - docker pull ${{ env.REGISTRY }}/${{ github.actor }}/php${{ matrix.php }}:${{ env.TAG }} + docker pull ${{ env.REGISTRY }}/${{ github.actor }}/belongs-to-through/php${{ matrix.php }}:${{ env.TAG }} continue-on-error: true env: TAG: ${{ hashFiles(format('.docker/php{0}.Dockerfile', matrix.php)) }} id: pull - run: | docker compose build php${{ matrix.php }} - docker tag belongs-to-through-php${{ matrix.php }} ${{ env.REGISTRY }}/${{ github.actor }}/php${{ matrix.php }}:${{ env.TAG }} - docker push ${{ env.REGISTRY }}/${{ github.actor }}/php${{ matrix.php }}:${{ env.TAG }} + docker tag belongs-to-through-php${{ matrix.php }} ${{ env.REGISTRY }}/${{ github.actor }}/belongs-to-through/php${{ matrix.php }}:${{ env.TAG }} + docker push ${{ env.REGISTRY }}/${{ github.actor }}/belongs-to-through/php${{ matrix.php }}:${{ env.TAG }} env: TAG: ${{ hashFiles(format('.docker/php{0}.Dockerfile', matrix.php)) }} if: steps.pull.outcome != 'success' diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 6136cc5..bd412b2 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -2,17 +2,17 @@ version: '3.8' services: php8.1: - image: ghcr.io/staudenmeir/php8.1:${TAG:-} + image: ghcr.io/staudenmeir/belongs-to-through/php8.1:${TAG:-} working_dir: /var/www/html volumes: - .:/var/www/html:delegated php8.2: - image: ghcr.io/staudenmeir/php8.2:${TAG:-} + image: ghcr.io/staudenmeir/belongs-to-through/php8.2:${TAG:-} working_dir: /var/www/html volumes: - .:/var/www/html:delegated php8.3: - image: ghcr.io/staudenmeir/php8.3:${TAG:-} + image: ghcr.io/staudenmeir/belongs-to-through/php8.3:${TAG:-} working_dir: /var/www/html volumes: - .:/var/www/html:delegated