From 77702a36f0434d48d4c7839736f98ef0ed8195ca Mon Sep 17 00:00:00 2001 From: eroncero Date: Thu, 13 Feb 2025 20:44:52 +0100 Subject: [PATCH] Massive update --- app/scripts/create_databases.sh | 3 ++- app/scripts/db_schemas/dolibarr.sql | 4 ---- app/scripts/dolibarr.sql | 4 ++++ app/scripts/install-dependencies.sh | 6 ++++-- dockerfile | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 app/scripts/db_schemas/dolibarr.sql create mode 100644 app/scripts/dolibarr.sql diff --git a/app/scripts/create_databases.sh b/app/scripts/create_databases.sh index ed57b81..cd278ac 100755 --- a/app/scripts/create_databases.sh +++ b/app/scripts/create_databases.sh @@ -1,2 +1,3 @@ #!/bin/sh -mariadb --user=dolibarr_user --password=dolipass < /app/scripts/db_schemas/dolibarr.sql #&& echo "Dolibarr user and DB created." || echo "Unable to create database."; exit 1 +service mariadb status > /dev/null 2>&1 || service mariadb start +mariadb --user=root < /app/scripts/dolibarr.sql && echo "Dolibarr user and DB created." diff --git a/app/scripts/db_schemas/dolibarr.sql b/app/scripts/db_schemas/dolibarr.sql deleted file mode 100644 index 4565365..0000000 --- a/app/scripts/db_schemas/dolibarr.sql +++ /dev/null @@ -1,4 +0,0 @@ -CREATE USER 'dolibarr'@'localhost' IDENTIFIED BY 'dolipass'; -CREATE DATABASE IF NOT EXISTS 'dolibarr'; -GRANT ALL PRIVILEGES TO dolibarr.* TO 'dolibarr'@'localhost'; -FLUSH PRIVILEGES; diff --git a/app/scripts/dolibarr.sql b/app/scripts/dolibarr.sql new file mode 100644 index 0000000..5ae93a0 --- /dev/null +++ b/app/scripts/dolibarr.sql @@ -0,0 +1,4 @@ +CREATE USER 'dolibarr'@'localhost' IDENTIFIED BY 'dolipass'; +CREATE DATABASE IF NOT EXISTS dolibarr; +GRANT ALL PRIVILEGES on dolibarr.* TO 'dolibarr'@'localhost'; +FLUSH PRIVILEGES; diff --git a/app/scripts/install-dependencies.sh b/app/scripts/install-dependencies.sh index 53f230a..f5c690b 100755 --- a/app/scripts/install-dependencies.sh +++ b/app/scripts/install-dependencies.sh @@ -1,4 +1,6 @@ #!/bin/sh -apt-get install php8.2 php8.2-common php8.2-fpm -y # PHP -apt-get install vim file bash-completion procps nginx screen git sudo less -y # Utils +apt-get install nginx -y +apt-get install php8.2 php8.2-common php8.2-fpm php8.2-mbstring php8.2-gd php8.2-curl php8.2-xml php8.2-imap php8.2-zip php8.2-intl php8.2-mysql -y # PHP +#apt-get install vim file bash-completion procps nginx screen git sudo less -y # Utils +apt-get install git sudo -y # Utils apt-get install mariadb-client mariadb-server -y # MariaDB Server + Client diff --git a/dockerfile b/dockerfile index 27f661a..81b63df 100644 --- a/dockerfile +++ b/dockerfile @@ -18,7 +18,7 @@ RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private RUN chmod 0440 /etc/ssl/private/dolibarr-selfsigned.key && chmod 0444 /etc/ssl/certs/dolibarr-selfsigned.crt && chown www-data:www-data /etc/ssl/private/dolibarr-selfsigned.key && chown www-data:www-data /etc/ssl/certs/dolibarr-selfsigned.crt -#RUN /app/scripts/create_databases.sh +RUN /app/scripts/create_databases.sh RUN mv /app/default /etc/nginx/sites-available/default