wait for started db

escoand · Aug 16, 2024 · 20c3524 · 20c3524
1 parent e37e7f4
commit 20c3524
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/test_kube.yaml b/.github/workflows/test_kube.yaml
@@ -31,14 +31,7 @@ jobs:
         run: |-
           set -euo pipefail
           find init/ -name 'secrets.*.yaml' -print -exec podman kube play {} \;
-          find kube/ -name '*.yaml' -print -exec podman kube play --quiet --start=false {} \;
-      - name: Start databases
-        run: |-
-          set -euo pipefail
-          podman pod start mariadb
-          podman wait --condition healthy mariadb-app
-      - name: Start pods
-        run: podman pod start -a
+          find kube/ -name '*.yaml' -print -exec podman kube play --quiet {} \;
       - name: Wait for healthy state
         run: |-
           set -euo pipefail
@@ -120,9 +113,5 @@ jobs:
         if: ${{ always() }}
         run: |-
           set -euo pipefail
-          yq -ot '. as $parent | (
-            .spec.containers[] | $parent.metadata.name + "-" + .name,
-            .spec.template.spec.containers[] | $parent.metadata.name + "-pod-" + .name,
-            .spec.initContainers[] | $parent.metadata.name + "-" + .name
-          )' kube/*.yaml |
+          podman ps -aq |
           xargs -tn1 podman logs -n
diff --git a/kube/nextcloud.yaml b/kube/nextcloud.yaml
@@ -87,6 +87,7 @@ spec:
         - sh
         - -c
         - |-
+          until mariadb --skip-ssl -h mariadb -p"$MARIADB_ROOT_PASSWORD" -e "select 1"; do sleep 3; done
           cat <<EOF | mariadb -h mariadb -p"$MARIADB_ROOT_PASSWORD"
           CREATE DATABASE IF NOT EXISTS $MYSQL_DATABASE;
           CREATE USER IF NOT EXISTS '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD';

diff --git a/kube/wordpress1.yaml b/kube/wordpress1.yaml
@@ -28,6 +28,7 @@ spec:
         - sh
         - -c
         - |-
+          until mariadb --skip-ssl -h mariadb -p"$MARIADB_ROOT_PASSWORD" -e "select 1"; do sleep 3; done
           cat <<EOF | mariadb -h mariadb -p"$MARIADB_ROOT_PASSWORD"
           CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME;
           CREATE USER IF NOT EXISTS '$WORDPRESS_DB_USER'@'%' IDENTIFIED BY '$WORDPRESS_DB_PASSWORD';

diff --git a/kube/wordpress2.yaml b/kube/wordpress2.yaml
@@ -28,6 +28,7 @@ spec:
         - sh
         - -c
         - |-
+          until mariadb --skip-ssl -h mariadb -p"$MARIADB_ROOT_PASSWORD" -e "select 1"; do sleep 3; done
           cat <<EOF | mariadb -h mariadb -p"$MARIADB_ROOT_PASSWORD"
           CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME;
           CREATE USER IF NOT EXISTS '$WORDPRESS_DB_USER'@'%' IDENTIFIED BY '$WORDPRESS_DB_PASSWORD';