Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .github/workflows/docker-publish-nginx.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: Nginx

on:
workflow_dispatch:
inputs:
version:
description: "Version to build"
required: true
default: "latest"
push:
branches:
- "latest"
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/docker-publish-php-fpm.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: PHP

on:
workflow_dispatch:
inputs:
version:
description: "Version to build"
required: true
default: "latest"
push:
branches:
- "latest"
Expand Down
15 changes: 15 additions & 0 deletions docker/docker-compose-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ services:
- mariadb
command: mariadb -h $MARIADB_HOST -u root -p$MARIADB_ROOT_PASSWORD -e "GRANT SELECT ON \`mysql\`.\`time_zone_name\` TO 'glpi'@'%'; FLUSH PRIVILEGES;"


glpi-db-upgrade:
image: eftechcombr/glpi:php-fpm-11.0.5
restart: on-failure
env_file: ./.env
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
- glpi-files:/var/lib/glpi:rw
- glpi-etc:/etc/glpi:rw
depends_on:
- mariadb
command:
- /usr/local/bin/glpi-db-upgrade.sh


glpi-db-install:
image: eftechcombr/glpi:php-fpm-11.0.5
restart: on-failure
Expand Down
10 changes: 2 additions & 8 deletions docker/php/scripts/glpi-db-upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@ dbUpgrade () {

php bin/console database:update \
--lang="$GLPI_LANG" \
--db-host="$MARIADB_HOST" \
--db-port="$MARIADB_PORT" \
--db-name="$MARIADB_DATABASE" \
--db-user="$MARIADB_USER" \
--db-password="$MARIADB_PASSWORD" \
--no-interaction

--no-interaction
}

php bin/console database:check_schema_integrity || dbUpgrade
dbUpgrade