From 1c5e6fcb7f62cc8ec2cba2951b273e6446bd757f Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 21 Nov 2024 16:24:36 +0100 Subject: [PATCH 1/2] remove unnecessary Dockerfile and use mariadb version direct --- docker-compose.test.yml | 4 ---- docker-compose.yml | 5 ++--- mariadb/Dockerfile | 4 ---- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 mariadb/Dockerfile diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 6b6b2c04f..fba2715bd 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index a4d759695..fbb0b1fcd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,10 +62,9 @@ services: ######################################################### mariadb: build: - context: ./mariadb - target: mariadb_server + mariadb:10.5 environment: - - MARIADB_ALLOW_EMPTY_PASSWORD=1 + - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 - MARIADB_USER=root networks: - internal-net diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile deleted file mode 100644 index 25075c79d..000000000 --- a/mariadb/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -######################################################################################################### -# mariadb server -######################################################################################################### -FROM mariadb:10.5 as mariadb_server From 8b1aa4b791efbee37667d72205b4884530ec5950 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 21 Nov 2024 16:35:03 +0100 Subject: [PATCH 2/2] fix syntax, remove mariadb build test --- .github/workflows/test_mariadb.yml | 32 ------------------------------ docker-compose.yml | 3 +-- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 .github/workflows/test_mariadb.yml diff --git a/.github/workflows/test_mariadb.yml b/.github/workflows/test_mariadb.yml deleted file mode 100644 index fe101bc48..000000000 --- a/.github/workflows/test_mariadb.yml +++ /dev/null @@ -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 ./ diff --git a/docker-compose.yml b/docker-compose.yml index fbb0b1fcd..f78a12031 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,8 +61,7 @@ services: ## MARIADB ############################################## ######################################################### mariadb: - build: - mariadb:10.5 + image: mariadb:10.5 environment: - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 - MARIADB_USER=root