forked from kamba4/sunders
Merge remote-tracking branch 'origin/main' into healthcheck
Some checks failed
Build (and tag) Images / build (push) Failing after 12s
Some checks failed
Build (and tag) Images / build (push) Failing after 12s
# Conflicts: # docker-compose.yml
This commit is contained in:
commit
27685701c7
4 changed files with 8 additions and 9 deletions
|
|
@ -2,21 +2,20 @@ name: Build (and tag) Images
|
|||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
workflow_dispatch:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: docker
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
uses: docker/setup-buildx-action@v4
|
||||
|
||||
- name: Login to Container Registry
|
||||
uses: docker/login-action@v3
|
||||
uses: docker/login-action@v4
|
||||
with:
|
||||
registry: git.hamburg.ccc.de
|
||||
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM quay.io/fedora/fedora-minimal:43
|
||||
FROM quay.io/fedora/fedora-minimal:46
|
||||
RUN microdnf install -y php-cli php-mysqli php-bcmath php-xml python-lxml gunzip https://raw.githubusercontent.com/rpmsphere/x86_64/master/d/dcron-4.5-7.1.x86_64.rpm && microdnf clean all
|
||||
COPY ./utils/* /opt/
|
||||
COPY ./data_init/*.sql /opt/init/init.sql
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM quay.io/fedora/fedora-minimal:43
|
||||
FROM quay.io/fedora/fedora-minimal:46
|
||||
RUN microdnf install -y python-pip && microdnf clean all && pip install OSMPythonTools
|
||||
|
||||
COPY ./lookup_country.py /opt/
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
services:
|
||||
db:
|
||||
image: mariadb:12.0.2
|
||||
image: mariadb:13.0.2
|
||||
restart: unless-stopped
|
||||
command: --max_allowed_packet=3250585600
|
||||
environment:
|
||||
|
|
|
|||
Loading…
Reference in a new issue