Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Docker Hub with GitHub Container Registry #298

Merged
merged 6 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion .github/workflows/asan.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
name: ASAN
on: [push, pull_request]
jobs:
auth:
runs-on: ubuntu-latest
name: Login to GitHub Container Registry
steps:
- uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

vanilla:
strategy:
matrix:
version: ["8.1", "8.2"]
if: success() || failure()
runs-on: ubuntu-latest
needs: auth
name: ASAN, PHP v${{matrix.version}}
steps:
- name: Checkout
Expand All @@ -19,6 +30,7 @@ jobs:
version: ["8.1", "8.2"]
if: success() || failure()
runs-on: ubuntu-latest
needs: auth
name: ASAN, PHP v${{matrix.version}}, opcache
steps:
- name: Checkout
Expand All @@ -31,9 +43,10 @@ jobs:
version: ["8.1", "8.2"]
if: success() || failure()
runs-on: ubuntu-latest
needs: auth
name: ASAN, PHP v${{matrix.version}}, JIT
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Test parallel
run: docker compose run parallel-asan-${{matrix.version}} docker/parallel.test -d opcache.enable_cli=1 -d opcache.jit=function -d opcache.jit_buffer_size=32M --asan
run: docker compose run parallel-asan-${{matrix.version}} docker/parallel.test -d opcache.enable_cli=1 -d opcache.jit=function -d opcache.jit_buffer_size=32M --asan
13 changes: 13 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,24 @@ on: [push, pull_request]
env:
NODE_COVERALLS_DEBUG: true
jobs:
auth:
runs-on: ubuntu-latest
name: Login to GitHub Container Registry
steps:
- uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

vanilla:
strategy:
matrix:
version: ["8.0", "8.1", "8.2"]
build: ["gcov", "release"]
if: success() || failure()
runs-on: ubuntu-latest
needs: auth
name: Linux, PHP v${{matrix.version}}, ${{matrix.build}}
steps:
- name: Checkout
Expand All @@ -31,6 +42,7 @@ jobs:
build: ["gcov", "release"]
if: success() || failure()
runs-on: ubuntu-latest
needs: auth
name: Linux, PHP v${{matrix.version}}, ${{matrix.build}}, opcache
steps:
- name: Checkout
Expand All @@ -52,6 +64,7 @@ jobs:
build: ["gcov", "release"]
if: success() || failure()
runs-on: ubuntu-latest
needs: auth
name: Linux, PHP v${{matrix.version}}, ${{matrix.build}}, JIT
steps:
- name: Checkout
Expand Down
52 changes: 22 additions & 30 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ services:
}
},
container_name: php-dbg-8.0,
image: parallelphp/php-dbg-8.0:8.0.24,
image: ghcr.io/krakjoe/php-dbg-8.0:8.0.24,
profiles: [php-8.0,dbg],
<<: [*dev, *parallel]
}
Expand All @@ -55,7 +55,7 @@ services:
}
},
container_name: php-gcov-8.0,
image: parallelphp/php-gcov-8.0:8.0.24,
image: ghcr.io/krakjoe/php-gcov-8.0:8.0.24,
profiles: [php-8.0,gcov],
<<: [*dev, *parallel]
}
Expand All @@ -70,7 +70,7 @@ services:
}
},
container_name: php-release-8.0,
image: parallelphp/php-release-8.0:8.0.24,
image: ghcr.io/krakjoe/php-release-8.0:8.0.24,
profiles: [php-8.0,release],
<<: [*dev, *parallel]
}
Expand All @@ -87,7 +87,7 @@ services:
}
},
container_name: parallel-dbg-8.0,
image: parallelphp/parallel-dbg-8.0:latest,
image: ghcr.io/krakjoe/parallel-dbg-8.0:latest,
profiles: [parallel-8.0,dbg],
<<: [*dev, *parallel]
}
Expand All @@ -103,7 +103,7 @@ services:
}
},
container_name: parallel-gcov-8.0,
image: parallelphp/parallel-gcov-8.0:latest,
image: ghcr.io/krakjoe/parallel-gcov-8.0:latest,
profiles: [parallel-8.0,gcov],
<<: [*dev, *parallel]
}
Expand All @@ -119,7 +119,7 @@ services:
}
},
container_name: parallel-release-8.0,
image: parallelphp/parallel-release-8.0:latest,
image: ghcr.io/krakjoe/parallel-release-8.0:latest,
profiles: [parallel-8.0,release],
<<: [*dev, *parallel]
}
Expand All @@ -135,7 +135,7 @@ services:
}
},
container_name: php-dbg-8.1,
image: parallelphp/php-dbg-8.1:8.1.11,
image: ghcr.io/krakjoe/php-dbg-8.1:8.1.11,
profiles: [php-8.1,dbg],
<<: [*dev, *parallel]
}
Expand All @@ -150,7 +150,7 @@ services:
}
},
container_name: php-gcov-8.1,
image: parallelphp/php-gcov-8.1:8.1.11,
image: ghcr.io/krakjoe/php-gcov-8.1:8.1.11,
profiles: [php-8.1,gcov],
<<: [*dev, *parallel]
}
Expand All @@ -165,7 +165,7 @@ services:
}
},
container_name: php-asan-8.1,
image: parallelphp/php-asan-8.1:8.1.11,
image: ghcr.io/krakjoe/php-asan-8.1:8.1.11,
profiles: [php-8.1,asan],
<<: [*dev, *parallel]
}
Expand All @@ -180,7 +180,7 @@ services:
}
},
container_name: php-release-8.1,
image: parallelphp/php-release-8.1:8.1.11,
image: ghcr.io/krakjoe/php-release-8.1:8.1.11,
profiles: [php-8.1,release],
<<: [*dev, *parallel]
}
Expand All @@ -196,7 +196,7 @@ services:
}
},
container_name: parallel-dbg-8.1,
image: parallelphp/parallel-dbg-8.1:latest,
image: ghcr.io/krakjoe/parallel-dbg-8.1:latest,
profiles: [parallel-8.1,dbg],
<<: [*dev, *parallel]
}
Expand All @@ -212,7 +212,7 @@ services:
}
},
container_name: parallel-gcov-8.1,
image: parallelphp/parallel-gcov-8.1:latest,
image: ghcr.io/krakjoe/parallel-gcov-8.1:latest,
profiles: [parallel-8.1,gcov],
<<: [*dev, *parallel]
}
Expand All @@ -227,7 +227,7 @@ services:
}
},
container_name: parallel-asan-8.1,
image: parallelphp/parallel-asan-8.1:latest,
image: ghcr.io/krakjoe/parallel-asan-8.1:latest,
profiles: [parallel-8.1,asan],
<<: [*dev, *parallel]
}
Expand All @@ -242,7 +242,7 @@ services:
}
},
container_name: parallel-release-8.1,
image: parallelphp/parallel-release-8.1:latest,
image: ghcr.io/krakjoe/parallel-release-8.1:latest,
profiles: [parallel-8.1,release],
<<: [*dev, *parallel]
}
Expand All @@ -256,11 +256,10 @@ services:
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 2,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: RC5,
}
},
container_name: php-dbg-8.2,
image: parallelphp/php-dbg-8.2:8.2.0RC5,
image: ghcr.io/krakjoe/php-dbg-8.2:8.2.0,
profiles: [php-8.2,dbg],
<<: [*dev, *parallel]
}
Expand All @@ -273,11 +272,10 @@ services:
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 2,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: RC5,
}
},
container_name: php-gcov-8.2,
image: parallelphp/php-gcov-8.2:8.2.0RC5,
image: ghcr.io/krakjoe/php-gcov-8.2:8.2.0,
profiles: [php-8.2,gcov],
<<: [*dev, *parallel]
}
Expand All @@ -290,11 +288,10 @@ services:
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 2,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: RC5,
}
},
container_name: php-asan-8.2,
image: parallelphp/php-asan-8.2:8.2.0RC5,
image: ghcr.io/krakjoe/php-asan-8.2:8.2.0,
profiles: [php-8.2,asan],
<<: [*dev, *parallel]
}
Expand All @@ -307,11 +304,10 @@ services:
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 2,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: RC5,
}
},
container_name: php-release-8.2,
image: parallelphp/php-release-8.2:8.2.0RC5,
image: ghcr.io/krakjoe/php-release-8.2:8.2.0,
profiles: [php-8.2,release],
<<: [*dev, *parallel]
}
Expand All @@ -324,11 +320,10 @@ services:
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 2,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: RC5,
}
},
container_name: parallel-dbg-8.2,
image: parallelphp/parallel-dbg-8.2:latest,
image: ghcr.io/krakjoe/parallel-dbg-8.2:latest,
profiles: [parallel-8.2,dbg],
<<: [*dev, *parallel]
}
Expand All @@ -341,11 +336,10 @@ services:
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 2,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: RC5,
}
},
container_name: parallel-gcov-8.2,
image: parallelphp/parallel-gcov-8.2:latest,
image: ghcr.io/krakjoe/parallel-gcov-8.2:latest,
profiles: [parallel-8.2,gcov],
<<: [*dev, *parallel]
}
Expand All @@ -358,11 +352,10 @@ services:
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 2,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: RC5,
}
},
container_name: parallel-asan-8.2,
image: parallelphp/parallel-asan-8.2:latest,
image: ghcr.io/krakjoe/parallel-asan-8.2:latest,
profiles: [parallel-8.2,asan],
<<: [*dev, *parallel]
}
Expand All @@ -375,11 +368,10 @@ services:
PHP_VERSION_MAJOR: 8,
PHP_VERSION_MINOR: 2,
PHP_VERSION_PATCH: 0,
PHP_VERSION_RC: RC5,
}
},
container_name: parallel-release-8.2,
image: parallelphp/parallel-release-8.2:latest,
image: ghcr.io/krakjoe/parallel-release-8.2:latest,
profiles: [parallel-8.2,release],
<<: [*dev, *parallel]
}
4 changes: 2 additions & 2 deletions docker/parallel.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG PHP_VERSION_MINOR
ARG PHP_VERSION_PATCH
ARG PHP_VERSION_RC

FROM parallelphp/php-$PHP_SRC_TYPE-$PHP_VERSION_MAJOR.$PHP_VERSION_MINOR:$PHP_VERSION_MAJOR.$PHP_VERSION_MINOR.$PHP_VERSION_PATCH$PHP_VERSION_RC
FROM ghcr.io/krakjoe/php-$PHP_SRC_TYPE-$PHP_VERSION_MAJOR.$PHP_VERSION_MINOR:$PHP_VERSION_MAJOR.$PHP_VERSION_MINOR.$PHP_VERSION_PATCH$PHP_VERSION_RC

ARG PHP_SRC_TYPE

Expand Down Expand Up @@ -38,4 +38,4 @@ RUN echo "extension=parallel.so" > \

RUN php -m

WORKDIR /opt/parallel
WORKDIR /opt/parallel
Loading