Skip to content

Commit

Permalink
1.0.1 adapt changes WSL to ubuntu
Browse files Browse the repository at this point in the history
  • Loading branch information
medilies committed Oct 16, 2021
1 parent 95e419c commit 440dd8e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.8"
version: "3.3"

services:
glpidb:
Expand All @@ -9,15 +9,15 @@ services:
- admin-db
volumes:
- glpi_database:/var/lib/mysql # CHANGE
- .\glpidb\scripts:/scripts
- ./glpidb/scripts:/scripts
command: mysqld --default-authentication-plugin=mysql_native_password
secrets:
- MYSQL_DATABASE
- MYSQL_ROOT_PASSWORD
- MYSQL_USER
- MYSQL_PASSWORD
environment:
- TZ='Africa/Algiers' # CHANGE
- TZ=Africa/Algiers # CHANGE
- MYSQL_DATABASE_FILE=/run/secrets/MYSQL_DATABASE
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/MYSQL_ROOT_PASSWORD
- MYSQL_USER_FILE=/run/secrets/MYSQL_USER
Expand All @@ -44,15 +44,15 @@ services:
ports:
- 50080:80 # CHANGE
volumes:
- .\glpi\scripts:/scripts
- ./glpi/scripts:/scripts
secrets:
- DB_SERVER
- MYSQL_DATABASE
- MYSQL_USER
- MYSQL_PASSWORD
environment:
- GLPI_ROOT_PATH=/var/www/html
- TZ='Africa/Algiers' # CHANGE
- TZ=Africa/Algiers # CHANGE
- MYSQL_DATABASE_FILE=/run/secrets/MYSQL_DATABASE
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/MYSQL_ROOT_PASSWORD
- MYSQL_USER_FILE=/run/secrets/MYSQL_USER
Expand All @@ -69,7 +69,7 @@ services:
secrets:
- DB_SERVER
environment:
- TZ='Africa/Algiers' # CHANGE
- TZ=Africa/Algiers # CHANGE
- PMA_HOST_FILE=/run/secrets/DB_SERVER

networks:
Expand Down
1 change: 1 addition & 0 deletions glpi/dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ RUN echo 'alias glpicli="/var/www/html/bin/console"' >>/root/.bashrc


COPY ./scripts /scripts
RUN chmod +x /scripts/*

RUN chown -R www-data .

Expand Down
6 changes: 2 additions & 4 deletions glpi/scripts/install_fusioninventory.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ curl -L https://github.com/fusioninventory/fusioninventory-for-glpi/releases/dow
glpicli plugin:activate fusioninventory &&
chown -R www-data /var/www/html &&
#
touch /var/spool/cron/crontabs/www-data &&
crontab -u www-data /var/spool/cron/crontabs/www-data &&
echo "*/1 * * * * /usr/bin/php5 /var/www/html/glpi/front/cron.php &>/dev/null" \
>>/var/spool/cron/crontabs/www-data &&
echo "*/1 * * * * php /var/www/html/front/cron.php &>/dev/null" \
>>/etc/crontab &&
/etc/init.d/cron restart

0 comments on commit 440dd8e

Please sign in to comment.