Compare commits

..

No commits in common. "release/v1.5.0" and "main" have entirely different histories.

5 changed files with 8 additions and 8 deletions

View file

@ -1,6 +1,7 @@
name: Build and Push Docker Image name: Build and Push Docker Image
on: on:
push: push:
branches: [main]
tags: ['v*'] tags: ['v*']
jobs: jobs:

View file

@ -18,10 +18,10 @@ jobs:
include: include:
- name: fedi-feed-router-base - name: fedi-feed-router-base
file: docker/build/Dockerfile.base file: docker/build/Dockerfile.base
version: php8.3-2 version: php8.3-1
- name: fedi-feed-router-ci - name: fedi-feed-router-ci
file: docker/build/Dockerfile.ci file: docker/build/Dockerfile.ci
version: php8.3-4 version: php8.3-3
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
@ -43,4 +43,5 @@ jobs:
push: true push: true
tags: | tags: |
forge.lvl0.xyz/lvl0/${{ matrix.name }}:${{ matrix.version }} forge.lvl0.xyz/lvl0/${{ matrix.name }}:${{ matrix.version }}
forge.lvl0.xyz/lvl0/${{ matrix.name }}:latest
forge.lvl0.xyz/lvl0/${{ matrix.name }}:${{ github.sha }} forge.lvl0.xyz/lvl0/${{ matrix.name }}:${{ github.sha }}

View file

@ -1,5 +1,5 @@
# Production Dockerfile - uses pre-built base image # Production Dockerfile - uses pre-built base image
FROM forge.lvl0.xyz/lvl0/fedi-feed-router-base:php8.3-2 FROM forge.lvl0.xyz/lvl0/fedi-feed-router-base:latest
# Set working directory # Set working directory
WORKDIR /app WORKDIR /app

View file

@ -1,5 +1,5 @@
# Base image with FrankenPHP, PHP extensions, Node, and Composer # Base image with FrankenPHP, PHP extensions, Node, and Composer
FROM dunglas/frankenphp:1.12.7-php8.3.35-alpine FROM dunglas/frankenphp:latest-php8.3-alpine
# Install system dependencies # Install system dependencies
RUN apk add --no-cache \ RUN apk add --no-cache \

View file

@ -1,7 +1,6 @@
# Image for CI: PHP and Composer only, no runtime server or frontend toolchain. # Image for CI: PHP and Composer only, no runtime server or frontend toolchain.
# pdo_mysql is here for the MariaDB test database (#169); pdo_sqlite stays until # Tests run against sqlite in memory (see .env.testing), so no database client
# that switch lands. No CLI database client — PHPUnit reaches the database # or cache extension is needed.
# through PDO and never shells out.
# #
# Published as fedi-feed-router-ci:php<version>-<revision>, not :latest. Runners # Published as fedi-feed-router-ci:php<version>-<revision>, not :latest. Runners
# cache mutable tags and will not re-pull them, so bump the revision in the tag # cache mutable tags and will not re-pull them, so bump the revision in the tag
@ -17,7 +16,6 @@ COPY --from=mlocati/php-extension-installer:2 /usr/bin/install-php-extensions /u
RUN install-php-extensions \ RUN install-php-extensions \
pdo_sqlite \ pdo_sqlite \
pdo_mysql \
mbstring \ mbstring \
dom \ dom \
xml \ xml \