From ae34f5069c6c3e7fbe554054dbe1b5c46eb7a098 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:32:21 +0000 Subject: [PATCH 1/3] Bump docker/build-push-action from 5 to 6 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5...v6) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/continuous-integration-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index bab7aa3261..0ff1133435 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -456,7 +456,7 @@ jobs: - name: Build and push to Docker Hub id: docker_build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true From d1075610b89b60df185ce56f17a9398b09c7c406 Mon Sep 17 00:00:00 2001 From: Dan Caseley Date: Tue, 20 Aug 2024 12:47:56 +0100 Subject: [PATCH 2/3] OF-2863: CI - Update docker compose command to match GHA runners --- .github/workflows/continuous-integration-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 0ff1133435..103f3d1fcf 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -263,7 +263,7 @@ jobs: mkdir olddb curl https://raw.githubusercontent.com/igniterealtime/Openfire/v3.9.3/src/database/openfire_sqlserver.sql > $GITHUB_WORKSPACE/olddb/openfire_sqlserver.sql - name: Start database server and install database - run: docker-compose -f ./build/ci/compose/mssql.yml up --detach + run: docker compose -f ./build/ci/compose/mssql.yml up --detach - name: Build & run update tester run: | pushd ./build/ci/updater @@ -304,7 +304,7 @@ jobs: mkdir olddb curl https://raw.githubusercontent.com/igniterealtime/Openfire/v3.9.3/src/database/openfire_postgresql.sql > $GITHUB_WORKSPACE/olddb/openfire_postgresql.sql - name: Start database server and install database - run: docker-compose -f ./build/ci/compose/postgresql.yml up --detach + run: docker compose -f ./build/ci/compose/postgresql.yml up --detach - name: Build & run update tester run: | pushd ./build/ci/updater @@ -345,7 +345,7 @@ jobs: mkdir olddb curl https://raw.githubusercontent.com/igniterealtime/Openfire/v3.9.3/src/database/openfire_mysql.sql > $GITHUB_WORKSPACE/olddb/openfire_mysql.sql - name: Start database server and install database - run: docker-compose -f ./build/ci/compose/mysql.yml up --detach + run: docker compose -f ./build/ci/compose/mysql.yml up --detach - name: Build & run update tester run: | pushd ./build/ci/updater From 847bb12c8db00c3b78185c3307687345b3b6e9bb Mon Sep 17 00:00:00 2001 From: akrherz Date: Thu, 22 Aug 2024 13:57:22 -0500 Subject: [PATCH 3/3] CI: adjustments to MSSQL --- build/ci/compose/scripts/mssql.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build/ci/compose/scripts/mssql.sh b/build/ci/compose/scripts/mssql.sh index b318d96c1d..8dff4f1a13 100755 --- a/build/ci/compose/scripts/mssql.sh +++ b/build/ci/compose/scripts/mssql.sh @@ -5,8 +5,8 @@ for i in {1..50}; do - /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -d master -Q "CREATE DATABASE openfire;" - /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -d openfire -i /openfiredb/openfire_sqlserver.sql + /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P $SA_PASSWORD -d master -Q "CREATE DATABASE openfire;" + /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P $SA_PASSWORD -d openfire -i /openfiredb/openfire_sqlserver.sql if [ $? -eq 0 ] then echo "openfire sql import" @@ -15,6 +15,11 @@ do echo "not ready yet..." sleep 1 fi + if [ $i -eq 50 ] + then + echo "Aborting after 50 failed attempts" + exit 1 + fi done sleep infinity # Keep the container running forever