Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump docker/build-push-action from 5 to 6 #2464

Merged
merged 3 commits into from
Aug 22, 2024
Merged

Bump docker/build-push-action from 5 to 6 #2464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae34f50
Bump docker/build-push-action from 5 to 6
dependabot[bot] Aug 22, 2024
d107561
OF-2863: CI - Update docker compose command to match GHA runners
Fishbowler Aug 20, 2024
847bb12
CI: adjustments to MSSQL
akrherz Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/continuous-integration-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions build/ci/compose/scripts/mssql.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Loading