Fixup
This commit is contained in:
parent
729dd188ef
commit
a677b98a37
3 changed files with 13 additions and 0 deletions
7
.github/workflows/php.yml
vendored
7
.github/workflows/php.yml
vendored
|
|
@ -74,6 +74,12 @@ jobs:
|
||||||
ghcr_token: ${{ secrets.GITHUB_TOKEN }}
|
ghcr_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
docker_hub_user: matthewbaggett
|
docker_hub_user: matthewbaggett
|
||||||
docker_hub_token: ${{ secrets.DOCKER_HUB_TOKEN }}
|
docker_hub_token: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||||
|
- name: Login to registry
|
||||||
|
uses: docker/login-action@v2
|
||||||
|
with:
|
||||||
|
registry: ${{ secrets.PRIVATE_REGISTRY }}
|
||||||
|
username: ${{ secrets.PRIVATE_REGISTRY_USER }}
|
||||||
|
password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
||||||
- uses: docker/build-push-action@v5
|
- uses: docker/build-push-action@v5
|
||||||
name: "Build: Build & Push"
|
name: "Build: Build & Push"
|
||||||
with:
|
with:
|
||||||
|
|
@ -88,6 +94,7 @@ jobs:
|
||||||
ghcr.io/benzine-framework/php:${{ matrix.variant }}-${{ matrix.version }}
|
ghcr.io/benzine-framework/php:${{ matrix.variant }}-${{ matrix.version }}
|
||||||
gone/php:${{ matrix.variant }}-${{ matrix.version }}
|
gone/php:${{ matrix.variant }}-${{ matrix.version }}
|
||||||
benzine/php:${{ matrix.variant }}-${{ matrix.version }}
|
benzine/php:${{ matrix.variant }}-${{ matrix.version }}
|
||||||
|
${{ secrets.PRIVATE_REGISTRY }}/php:${{ matrix.variant }}-${{ matrix.version }}
|
||||||
build-args: |
|
build-args: |
|
||||||
${{ steps.build_args.outputs.result }}
|
${{ steps.build_args.outputs.result }}
|
||||||
cache-from: "${{ env.DOCKER_CACHE_FROM }},scope=${{ matrix.variant }}-${{ matrix.version }}"
|
cache-from: "${{ env.DOCKER_CACHE_FROM }},scope=${{ matrix.variant }}-${{ matrix.version }}"
|
||||||
|
|
|
||||||
5
.secrets.example
Normal file
5
.secrets.example
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
GITHUB_TOKEN=
|
||||||
|
DOCKER_HUB_TOKEN=
|
||||||
|
PRIVATE_REGISTRY_ENDPOINT=registry.example.org
|
||||||
|
PRIVATE_REGISTRY_USER=
|
||||||
|
PRIVATE_REGISTRY_TOKEN=
|
||||||
|
|
@ -8,6 +8,7 @@ LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
|
||||||
ARG PHP_PACKAGES
|
ARG PHP_PACKAGES
|
||||||
ARG COMPOSER_VERSION
|
ARG COMPOSER_VERSION
|
||||||
ENV COMPOSER_ALLOW_SUPERUSER=1
|
ENV COMPOSER_ALLOW_SUPERUSER=1
|
||||||
|
ENV COMPOSER_HOME=/root/.composer
|
||||||
COPY core/install-report.sh /usr/bin/install-report
|
COPY core/install-report.sh /usr/bin/install-report
|
||||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
RUN echo "Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
|
RUN echo "Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue