Merge pull request #3396 from gradido/remove_mariadb_dockerfile

feat(database): use the same mariadb version everywhere
This commit is contained in:
einhornimmond 2024-12-16 20:03:37 +01:00 committed by GitHub
commit 96e6d23f08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 44 deletions

View File

@ -1,32 +0,0 @@
name: Gradido MariaDB Test CI
on: push
jobs:
files-changed:
name: Detect File Changes - MariaDB
runs-on: ubuntu-latest
outputs:
mariadb: ${{ steps.changes.outputs.mariadb }}
steps:
- uses: actions/checkout@v3.3.0
- name: Check for frontend file changes
uses: dorny/paths-filter@v2.11.1
id: changes
with:
token: ${{ github.token }}
filters: .github/file-filters.yml
list-files: shell
build_test:
if: needs.files-changed.outputs.mariadb == 'true'
name: Docker Build Test - MariaDB
needs: files-changed
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: MariaDB | Build 'test' image
run: docker build --target mariadb_server -t "gradido/mariadb:test" -f ./mariadb/Dockerfile ./

View File

@ -92,10 +92,6 @@ services:
## MARIADB ##############################################
#########################################################
mariadb:
image: gradido/mariadb:test
environment:
- MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1
- MARIADB_USER=root
networks:
- internal-net
- external-net

View File

@ -61,11 +61,9 @@ services:
## MARIADB ##############################################
#########################################################
mariadb:
build:
context: ./mariadb
target: mariadb_server
image: mariadb:10.5
environment:
- MARIADB_ALLOW_EMPTY_PASSWORD=1
- MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1
- MARIADB_USER=root
networks:
- internal-net

View File

@ -1,4 +0,0 @@
#########################################################################################################
# mariadb server
#########################################################################################################
FROM mariadb:10.5 as mariadb_server