new version 16.0.1

This commit is contained in:
admin2
2022-10-12 19:04:36 +03:00
parent 38ec955d9b
commit de480bd352
17 changed files with 752 additions and 23 deletions
+3
View File
@@ -0,0 +1,3 @@
# Ignore CI docker-compose
docker-compose.yml
nginx.conf
+14
View File
@@ -0,0 +1,14 @@
########################################
# Dolibarr configuration
########################################
DOLIBARR_DB_ROOT_PWD=mysqlrootdolibarr
DOLIBARR_DB_NAME=dolibarr
DOLIBARR_DB_USER=dolibarr
DOLIBARR_DB_PASSWORD=dolibarr_PW.s4ve
TAG=16.0.1
VCS_REF=""
IMAGE_NAME=dolibarr:16.0.1
BUILD_DATE=2022-10-11T15:31:19Z
+96 -23
View File
@@ -1,23 +1,44 @@
version: "2.3"
volumes:
dolibarrdb:
dolibarrdbbackup:
dolibarrdata:
dolibarrdocuments:
dolibarrscripts:
db:
data:
documents:
scripts:
services:
# https://docs.docker.com/docker-hub/builds/automated-testing/
sut:
build:
context: ./test
dockerfile: Dockerfile
depends_on:
- dolibarr
- dolibarr_nginx
volumes_from:
- dolibarr
volumes:
- data:/var/www/html
- documents:/var/www/documents
- scripts:/var/www/scripts
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
environment:
- DOCKER_TEST_CONTAINER=dolibarr
- DOCKER_WEB_CONTAINER=dolibarr_nginx
- DOLI_DB_NAME=${DOLIBARR_DB_NAME}
- DOLI_DB_USER=${DOLIBARR_DB_USER}
- DOLI_DB_PASSWORD=${DOLIBARR_DB_PASSWORD}
dolibarr:
build:
context: ./
dockerfile: https://raw.githubusercontent.com/proofy/docker-dolibarr/master/images/15.0/php7.4-apache-amd64/Dockerfile
dockerfile: Dockerfile
args:
- TAG=${TAG}
- VCS_REF=${VCS_REF}
- BUILD_DATE=${BUILD_DATE}
image: ${IMAGE_NAME}:${TAG}
image: ${IMAGE_NAME}
container_name: dolibarr
#restart: always
depends_on:
@@ -26,33 +47,85 @@ services:
links:
- dolibarr_db
expose:
- "80"
ports:
- "7080:80"
- "9000"
#ports:
# - "9090:9000"
volumes:
- dolibarrdata:/var/www/html
- dolibarrdocuments:/var/www/documents
- dolibarrscripts:/var/www/scripts
- data:/var/www/html
- documents:/var/www/documents
- scripts:/var/www/scripts
#- /srv/dolibarr/html:/var/www/html
#- /srv/dolibarr/documents:/var/www/documents
#- /srv/dolibarr/scripts:/var/www/scripts
environment:
- DOLI_DB_HOST=dolibarr_db # same as mysql container name
- DOLI_DB_TYPE=pgsql
- DOLI_DB_HOST=dolibarr_db # same as pgsql container name
- DOLI_DB_PORT=5432
- DOLI_DB_NAME=${DOLIBARR_DB_NAME}
- DOLI_DB_USER=${DOLIBARR_DB_USER}
- DOLI_DB_PASSWORD=${DOLIBARR_DB_PASSWORD}
dolibarr_db:
image: proofy/postgres-13-bullseye-apb
restart: always
image: postgres:latest
container_name: dolibarr_db
#restart: always
healthcheck:
test: ["CMD", "pg_isready", "-U", "${DOLIBARR_DB_USER}", "-d", "${DOLIBARR_DB_PASSWORD}"]
interval: 60s
retries: 5
#start-period: 10s
mem_limit: 256M
memswap_limit: 256M
expose:
- "5432"
#ports:
# - "55432:5432"
volumes:
- db:/var/lib/postgresql/data
#- /srv/dolibarr/db:/var/lib/postgresql/data
environment:
- POSTGRES_PASSWORD=${DOLIBARR_DB_PASSWORD}
- POSTGRES_DB=${DOLIBARR_DB_NAME}
- POSTGRES_USER=${DOLIBARR_DB_USER}
# ports:
# - 5432:5432
# https://raw.githubusercontent.com/k0lter/autopostgresqlbackup/master/autopostgresqlbackup
volumes:
- dolibarrdbbackup:/var/lib/autopostgresqlbackup
- dolibarrdb:/var/lib/postgresql/data
- POSTGRES_PASSWORD=${DOLIBARR_DB_PASSWORD}
dolibarr_nginx:
image: nginx:latest
container_name: dolibarr_nginx
#restart: always
expose:
- "80"
ports:
- "8080:80"
# # If you need SSL connection
# - "8443:443"
depends_on:
- dolibarr
links:
- dolibarr
volumes:
- data:/var/www/html
#- /srv/dolibarr/html:/var/www/html
- ./nginx/templates:/etc/nginx/templates
# Provide a custom nginx conf
#- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
# If you need SSL connection, you can provide your own certificates
# - ./certs:/etc/letsencrypt
# - ./certs-data:/data/letsencrypt
environment:
- NGINX_HOST=localhost # set your local domain or your live domain
- NGINX_PHP_CGI=dolibarr:9000 # same as dolibarr container name
dolibarr_mailer:
image: sj26/mailcatcher:latest
hostname: dolibarr_mailer
container_name: dolibarr_mailer
restart: always
expose:
- 1025
ports:
- "1025:1025"
- "1080:1080"
# If you want, you can sync time & timezone with host
#volumes:
# - /etc/localtime:/etc/localtime:ro
# - /etc/timezone:/etc/timezone:ro
Executable
+271
View File
@@ -0,0 +1,271 @@
#!/bin/sh
set -e
log() {
echo "[$0] [$(date +%Y-%m-%dT%H:%M:%S)] $*"
}
# version_greater A B returns whether A > B
version_greater() {
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ]
}
# return true if specified directory is empty
directory_empty() {
[ -z "$(ls -A "$1/")" ]
}
run_as() {
if [ "$(id -u)" = 0 ]; then
su - www-data -s /bin/sh -c "$1"
else
sh -c "$1"
fi
}
if [ ! -f /usr/local/etc/php/php.ini ]; then
log "Initializing PHP configuration..."
cat <<EOF > /usr/local/etc/php/php.ini
date.timezone = "${PHP_INI_DATE_TIMEZONE}"
memory_limit = ${PHP_MEMORY_LIMIT}
file_uploads = On
upload_max_filesize = ${PHP_MAX_UPLOAD}
post_max_size = ${PHP_MAX_UPLOAD}
max_execution_time = ${PHP_MAX_EXECUTION_TIME}
sendmail_path = /usr/sbin/sendmail -t -i
extension = calendar.so
EOF
fi
if [ ! -d /var/www/documents ]; then
log "Initializing Dolibarr documents directory..."
mkdir -p /var/www/documents
fi
log "Updating Dolibarr users and group..."
usermod -u "$WWW_USER_ID" www-data
groupmod -g "$WWW_GROUP_ID" www-data
log "Updating Dolibarr folder ownership..."
chown -R www-data:www-data /var/www
if [ ! -d /var/www/html/conf/ ]; then
log "Initializing Dolibarr HTML configuration directory..."
mkdir -p /var/www/html/conf/
fi
# Create a default config if autoconfig enabled
if [ -n "$DOLI_AUTO_CONFIGURE" ] && [ ! -f /var/www/html/conf/conf.php ]; then
log "Initializing Dolibarr HTML configuration..."
cat <<EOF > /var/www/html/conf/conf.php
<?php
// Config file for Dolibarr ${DOLI_VERSION} ($(date +%Y-%m-%dT%H:%M:%S%:z))
// ###################
// # Main parameters #
// ###################
\$dolibarr_main_url_root='${DOLI_URL_ROOT}';
\$dolibarr_main_document_root='/var/www/html';
\$dolibarr_main_url_root_alt='/custom';
\$dolibarr_main_document_root_alt='/var/www/html/custom';
\$dolibarr_main_data_root='/var/www/documents';
\$dolibarr_main_db_host='${DOLI_DB_HOST}';
\$dolibarr_main_db_port='${DOLI_DB_PORT}';
\$dolibarr_main_db_name='${DOLI_DB_NAME}';
\$dolibarr_main_db_prefix='${DOLI_DB_PREFIX}';
\$dolibarr_main_db_user='${DOLI_DB_USER}';
\$dolibarr_main_db_pass='${DOLI_DB_PASSWORD}';
\$dolibarr_main_db_type='${DOLI_DB_TYPE}';
\$dolibarr_main_db_character_set='${DOLI_DB_CHARACTER_SET}';
\$dolibarr_main_db_collation='${DOLI_DB_COLLATION}';
// ##################
// # Login #
// ##################
\$dolibarr_main_authentication='${DOLI_AUTH}';
\$dolibarr_main_auth_ldap_host='${DOLI_LDAP_HOST}';
\$dolibarr_main_auth_ldap_port='${DOLI_LDAP_PORT}';
\$dolibarr_main_auth_ldap_version='${DOLI_LDAP_VERSION}';
\$dolibarr_main_auth_ldap_servertype='${DOLI_LDAP_SERVERTYPE}';
\$dolibarr_main_auth_ldap_login_attribute='${DOLI_LDAP_LOGIN_ATTRIBUTE}';
\$dolibarr_main_auth_ldap_dn='${DOLI_LDAP_DN}';
\$dolibarr_main_auth_ldap_filter ='${DOLI_LDAP_FILTER}';
\$dolibarr_main_auth_ldap_admin_login='${DOLI_LDAP_ADMIN_LOGIN}';
\$dolibarr_main_auth_ldap_admin_pass='${DOLI_LDAP_ADMIN_PASS}';
\$dolibarr_main_auth_ldap_debug='${DOLI_LDAP_DEBUG}';
// ##################
// # Security #
// ##################
\$dolibarr_main_prod='${DOLI_PROD}';
\$dolibarr_main_force_https='${DOLI_HTTPS}';
\$dolibarr_main_restrict_os_commands='mysqldump, mysql, pg_dump, pgrestore';
\$dolibarr_nocsrfcheck='${DOLI_NO_CSRF_CHECK}';
\$dolibarr_main_cookie_cryptkey='$(openssl rand -hex 32)';
\$dolibarr_mailing_limit_sendbyweb='0';
EOF
chown www-data:www-data /var/www/html/conf/conf.php
chmod 766 /var/www/html/conf/conf.php
fi
# Detect Docker container version (ie. previous installed version)
installed_version="0.0.0.0"
if [ -f /var/www/documents/.docker-container-version ]; then
# shellcheck disable=SC2016
installed_version="$(cat /var/www/documents/.docker-container-version)"
fi
if [ -f /var/www/documents/install.version ]; then
# shellcheck disable=SC2016
installed_version="$(cat /var/www/documents/install.version)"
mv \
/var/www/documents/install.version \
/var/www/documents/.docker-container-version
fi
# Detect Docker image version (docker specific solution)
# shellcheck disable=SC2016
image_version="${DOLI_VERSION}"
if [ -f /usr/src/dolibarr/.docker-image-version ]; then
# shellcheck disable=SC2016
image_version="$(cat /usr/src/dolibarr/.docker-image-version)"
fi
if version_greater "$installed_version" "$image_version"; then
log "Can't start Dolibarr because the version of the data ($installed_version) is higher than the docker image version ($image_version) and downgrading is not supported. Are you sure you have pulled the newest image version?"
exit 1
fi
# Initialize image
if version_greater "$image_version" "$installed_version"; then
log "Dolibarr initialization..."
if [ "$(id -u)" = 0 ]; then
rsync_options="-rlDog --chown www-data:root"
else
rsync_options="-rlD"
fi
mkdir -p /var/www/scripts
rsync $rsync_options /usr/src/dolibarr/scripts/ /var/www/scripts/
rsync $rsync_options --delete --exclude /conf/ --exclude /custom/ --exclude /theme/ /usr/src/dolibarr/htdocs/ /var/www/html/
for dir in conf custom; do
if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
rsync $rsync_options --include "/$dir/" --exclude '/*' /usr/src/dolibarr/htdocs/ /var/www/html/
fi
done
# The theme folder contains custom and official themes. We must copy even if folder is not empty, but not delete content either
for dir in theme; do
rsync $rsync_options --include "/$dir/" --exclude '/*' /usr/src/dolibarr/htdocs/ /var/www/html/
done
if [ "$installed_version" != "0.0.0.0" ]; then
# Call upgrade if needed
# https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#With_Dolibarr_.28standard_.zip_package.29
log "Dolibarr upgrade from $installed_version to $image_version..."
if [ -f /var/www/documents/install.lock ]; then
rm /var/www/documents/install.lock
fi
base_version=$(echo "${installed_version}" | sed -e 's|\(.*\..*\)\..*|\1|g')
target_version=$(echo "${image_version}" | sed -e 's|\(.*\..*\)\..*|\1|g')
run_as "cd /var/www/html/install/ && php upgrade.php ${base_version}.0 ${target_version}.0"
run_as "cd /var/www/html/install/ && php upgrade2.php ${base_version}.0 ${target_version}.0"
run_as "cd /var/www/html/install/ && php step5.php ${base_version}.0 ${target_version}.0"
log 'This is a lock file to prevent use of install pages (generated by container entrypoint)' > /var/www/documents/install.lock
chown www-data:www-data /var/www/documents/install.lock
chmod 400 /var/www/documents/install.lock
elif [ -n "$DOLI_AUTO_CONFIGURE" ] && [ ! -f /var/www/documents/install.lock ]; then
log "Create forced values for first Dolibarr install..."
cat <<EOF > /var/www/html/install/install.forced.php
<?php
// Forced install config file for Dolibarr ${DOLI_VERSION} ($(date +%Y-%m-%dT%H:%M:%S%:z))
/** @var bool Hide PHP informations */
\$force_install_nophpinfo = true;
/** @var int 1 = Lock and hide environment variables, 2 = Lock all set variables */
\$force_install_noedit = 2;
/** @var string Information message */
\$force_install_message = 'Dolibarr installation (Docker)';
/** @var string Data root absolute path (documents folder) */
\$force_install_main_data_root = '/var/www/documents';
/** @var bool Force HTTPS */
\$force_install_mainforcehttps = !empty('${DOLI_HTTPS}');
/** @var string Database name */
\$force_install_database = '${DOLI_DB_NAME}';
/** @var string Database driver (mysql|mysqli|pgsql|mssql|sqlite|sqlite3) */
\$force_install_type = '${DOLI_DB_TYPE}';
/** @var string Database server host */
\$force_install_dbserver = '${DOLI_DB_HOST}';
/** @var int Database server port */
\$force_install_port = '${DOLI_DB_PORT}';
/** @var string Database tables prefix */
\$force_install_prefix = '${DOLI_DB_PREFIX}';
/** @var string Database username */
\$force_install_databaselogin = '${DOLI_DB_USER}';
/** @var string Database password */
\$force_install_databasepass = '${DOLI_DB_PASSWORD}';
/** @var bool Force database user creation */
\$force_install_createuser = false;
/** @var bool Force database creation */
\$force_install_createdatabase = !empty('${DOLI_DB_ROOT_LOGIN}');
/** @var string Database root username */
\$force_install_databaserootlogin = '${DOLI_DB_ROOT_LOGIN}';
/** @var string Database root password */
\$force_install_databaserootpass = '${DOLI_DB_ROOT_PASSWORD}';
/** @var string Dolibarr super-administrator username */
\$force_install_dolibarrlogin = '${DOLI_ADMIN_LOGIN}';
/** @var bool Force install locking */
\$force_install_lockinstall = true;
/** @var string Enable module(s) (Comma separated class names list) */
\$force_install_module = '${DOLI_MODULES}';
EOF
log "You shall complete Dolibarr install manually at '${DOLI_URL_ROOT}/install'"
fi
fi
if [ ! -d /var/www/htdocs ]; then
log "Adding a symlink to /var/www/htdocs..."
ln -s /var/www/html /var/www/htdocs
fi
if [ ! -d /var/www/scripts ]; then
log "Initializing Dolibarr scripts directory..."
cp /usr/src/dolibarr/scripts /var/www/scripts
fi
if [ -f /var/www/documents/install.lock ]; then
log "Updating Dolibarr installed version..."
echo "$image_version" > /var/www/documents/.docker-container-version
fi
log "Serving Dolibarr..."
exec "$@"
+3
View File
@@ -0,0 +1,3 @@
# DockerHub automated tests hooks
See documentation for details: <https://docs.docker.com/docker-hub/builds/advanced/>
Executable
+12
View File
@@ -0,0 +1,12 @@
#!/bin/bash
# See documentation for details:
# https://docs.docker.com/docker-hub/builds/advanced/
# https://microbadger.com/labels
docker build \
--build-arg "TAG=${DOCKER_TAG}" \
--build-arg "VCS_REF=$(git rev-parse --short HEAD)" \
--build-arg "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
-f "$DOCKERFILE_PATH" \
-t "$IMAGE_NAME" .
+33
View File
@@ -0,0 +1,33 @@
#!/bin/bash
# See documentation for details:
# https://docs.docker.com/docker-hub/builds/advanced/
if [ -n "${DOCKER_REGISTRY}" ]; then
export DOCKER_BASE_IMAGE=${DOCKER_REGISTRY}/${DOCKER_REPO}
else
export DOCKER_BASE_IMAGE=${DOCKER_REPO}
fi
if [ -f ./.dockertags ]; then
for tag in $(cat ./.dockertags); do
if [ ! "${tag}" = "${DOCKER_TAG}" ]; then
docker tag "$IMAGE_NAME" "$DOCKER_BASE_IMAGE:$tag"
docker push "$DOCKER_BASE_IMAGE:$tag"
fi
done
fi
# Push image with tag set to commit hash
docker tag "$IMAGE_NAME" "$DOCKER_BASE_IMAGE:$SOURCE_COMMIT"
docker push "$DOCKER_BASE_IMAGE:$SOURCE_COMMIT"
if [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_LOGIN}" ]; then
if [ -n "${DOCKER_REGISTRY}" ]; then
echo "Logout of Docker Registry ${DOCKER_REGISTRY}..."
docker logout "${DOCKER_REGISTRY}"
else
echo "Logout of Docker default Registry..."
docker logout
fi
fi
+7
View File
@@ -0,0 +1,7 @@
#!/bin/bash
# See documentation for details:
# https://docs.docker.com/docker-hub/builds/advanced/
#echo 'Removing persisted data...'
#rm -rf "${APP_HOME:-/srv/dolibarr}"
Executable
+14
View File
@@ -0,0 +1,14 @@
#!/bin/bash
# See documentation for details:
# https://docs.docker.com/docker-hub/builds/advanced/
if [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_LOGIN}" ]; then
if [ -n "${DOCKER_REGISTRY}" ]; then
echo "Login to Docker Registry ${DOCKER_REGISTRY}..."
docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY}"
else
echo "Login to Docker default Registry..."
docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}"
fi
fi
Executable
+15
View File
@@ -0,0 +1,15 @@
#!/bin/bash
# See documentation for details:
# https://docs.docker.com/docker-hub/builds/advanced/
if [ ! -f '.env' ]; then
echo 'Init docker compose environment variables...'
cp .env_template .env.tmp
mv .env.tmp .env
fi
#echo 'Preparing persisted data...'
#mkdir -p "${APP_HOME:-/srv/dolibarr}"
#chown 777 "${APP_HOME:-/srv/dolibarr}"
Executable
+6
View File
@@ -0,0 +1,6 @@
#!/bin/bash
# See documentation for details:
# https://docs.docker.com/docker-hub/builds/advanced/
docker push "$IMAGE_NAME"
Executable
+39
View File
@@ -0,0 +1,39 @@
#!/bin/bash
# Custom script to run locally DockerHub hooks
# See documentation for details:
# https://docs.docker.com/docker-hub/builds/advanced/
echo "Custom script to run locally DockerHub hooks..."
set -e
export SOURCE_BRANCH
SOURCE_BRANCH=$(git rev-parse --abbrev-ref HEAD)
export SOURCE_COMMIT
SOURCE_COMMIT=$(git rev-parse --short HEAD)
export COMMIT_MSG
COMMIT_MSG=$(git log -1 --format=%s)
export DOCKER_REPO=monogramm/docker-dolibarr
export DOCKERFILE_PATH=Dockerfile
export DOCKER_TAG=${VARIANT}
if [ -n "${DOCKER_REGISTRY}" ]; then
export IMAGE_NAME=${DOCKER_REGISTRY}/${DOCKER_REPO}:${DOCKER_TAG}
else
export IMAGE_NAME=${DOCKER_REPO}:${DOCKER_TAG}
fi
# Execute hooks in given order
IFS=',' read -ra STEPS <<< "${1:-build,test}"
for step in "${STEPS[@]}"
do
for hook in "pre_${step}" "${step}" "post_${step}"; do
if [ -f "./hooks/${hook}" ]; then
echo "Executing ${hook} hook..."
"./hooks/${hook}"
fi
done
done
echo "DockerHub hooks finished"
Executable
+35
View File
@@ -0,0 +1,35 @@
#!/bin/bash
# See documentation for details:
# https://docs.docker.com/docker-hub/builds/advanced/
if [ "${DOCKERFILE_PATH}" = "Dockerfile.develop" ] || [ "${DOCKERFILE_PATH}" = "Dockerfile.gitpod" ]; then
echo "No tests (yet) for ${DOCKERFILE_PATH} images."
exit 0
fi
for file in docker-compose*.test.yml; do
echo "Starting Test in ${file}..."
# Build test container
docker-compose --no-ansi -f "${file}" build sut
# Test container run
docker-compose --no-ansi -f "${file}" up -d && sleep 60
docker-compose --no-ansi -f "${file}" logs -f "sut"
docker-compose --no-ansi -f "${file}" ps
docker-compose --no-ansi -f "${file}" logs --no-color "dolibarr_db"
docker-compose --no-ansi -f "${file}" logs --no-color "dolibarr"
docker-compose --no-ansi -f "${file}" ps "sut" | grep "Exit 0" || exit 1
docker-compose --no-ansi -f "${file}" down
# Test container restart
docker-compose --no-ansi -f "${file}" up -d && sleep 60
docker-compose --no-ansi -f "${file}" logs -f "sut"
docker-compose --no-ansi -f "${file}" ps
docker-compose --no-ansi -f "${file}" logs --no-color "dolibarr_db"
docker-compose --no-ansi -f "${file}" logs --no-color "dolibarr"
docker-compose --no-ansi -f "${file}" ps "sut" | grep "Exit 0" || exit 1
docker-compose --no-ansi -f "${file}" down -v
done
+32
View File
@@ -0,0 +1,32 @@
server {
listen 80;
server_name localhost;
root /var/www/html;
index index.php;
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log;
location / {
try_files $uri $uri/ index.php;
}
location ~ [^/]\.php(/|$) {
# try_files $uri =404;
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass dolibarr:9000;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
}
location /api {
if ( !-e $request_filename) {
rewrite ^.* /api/index.php last;
}
}
}
+60
View File
@@ -0,0 +1,60 @@
server {
listen 80;
listen [::]:80;
add_header Referrer-Policy origin; # make sure outgoing links don't show the URL to the Matomo instance
root /var/www/html;
index index.php index.html;
try_files $uri $uri/ =404;
## only allow accessing the following php files
location ~ \.php$ {
# regex to split $uri to $fastcgi_script_name and $fastcgi_path
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php;
# Check that the PHP script exists before passing it
try_files $fastcgi_script_name =404;
proxy_connect_timeout 3600;
proxy_send_timeout 3600;
proxy_read_timeout 3600;
send_timeout 3600;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param HTTP_PROXY ""; # prohibit httpoxy: https://httpoxy.org/
fastcgi_pass ${NGINX_PHP_CGI};
}
## disable all access to the following directories
location ~ /\.ht {
deny all;
return 403;
}
location ~ /\.git {
deny all;
}
location ~ \.(gif|ico|jpg|png|svg|js|css|htm|html|mp3|mp4|wav|ogg|avi|ttf|eot|woff|woff2|json)$ {
allow all;
## Cache images,CSS,JS and webfonts for an hour
## Increasing the duration may improve the load-time, but may cause old files to show after an Matomo upgrade
expires 1h;
add_header Pragma public;
add_header Cache-Control "public";
}
location ~ /(libs|vendor|plugins|misc/user) {
deny all;
return 403;
}
## properly display textfiles in root directory
location ~/(.*\.md|LEGALNOTICE|LICENSE) {
default_type text/plain;
}
}
# vim: filetype=nginx
+12
View File
@@ -0,0 +1,12 @@
FROM php:7.4-cli-alpine
COPY docker_test.sh /docker_test.sh
RUN set -ex; \
chmod 755 /docker_test.sh; \
apk add --update \
curl \
git \
;
CMD ["/docker_test.sh"]
+100
View File
@@ -0,0 +1,100 @@
#!/bin/sh
set -e
log() {
echo "[$0] [$(date +%Y-%m-%dT%H:%M:%S)] $*"
}
################################################################################
# Testing docker containers
log "Waiting to ensure everything is fully ready for the tests..."
sleep 60
log "Checking main containers are reachable..."
if ! ping -c 10 -q "${DOCKER_TEST_CONTAINER}" ; then
log 'Main container is not responding!'
# TODO Display logs to help bug fixing
#log 'Check the following logs for details:'
#tail -n 100 logs/*.log
exit 2
fi
################################################################################
# Success
log 'Docker tests successful'
################################################################################
# Automated Service Unit tests
# https://docs.docker.com/docker-hub/builds/automated-testing/
################################################################################
if [ -n "${DOCKER_WEB_CONTAINER}" ]; then
if ! ping -c 10 -q "${DOCKER_WEB_CONTAINER}" ; then
log 'Web container is not responding!'
# TODO Display logs to help bug fixing
#log 'Check the following logs for details:'
#tail -n 100 logs/*.log
exit 2
fi
DOCKER_WEB_CONTAINER_BASE_URL=http://${DOCKER_WEB_CONTAINER}:${DOCKER_WEB_PORT:-80}/
log "Checking Health API: ${DOCKER_WEB_CONTAINER_BASE_URL}"
curl "${DOCKER_WEB_CONTAINER_BASE_URL}"
#curl --fail "${DOCKER_WEB_CONTAINER_BASE_URL}" | grep -q -e 'Login' || exit 1
if [ ! -f /var/www/documents/install.lock ]; then
log 'Installing Dolibarr...'
mkdir -p /tmp/logs
log 'Calling Dolibarr install (step 2)...'
set +e
curl -kL -o /tmp/logs/install_step2.html -s -w "%{http_code}" \
-X POST "${DOCKER_WEB_CONTAINER_BASE_URL}/install/step2.php" \
--data "testpost=ok&action=set&dolibarr_main_db_character_set=utf8&dolibarr_main_db_collation=utf8_unicode_ci&selectlang=fr_FR" \
> /tmp/logs/install_step2.status
set -e
if ! grep -q 200 /tmp/logs/install_step2.status; then
log "Something went wrong during Dolibarr database installation. Check the logs for details: $(cat /tmp/logs/install_step2.html)"
exit 1
fi
log 'Calling Dolibarr install (step 5)...'
set +e
curl -kL -o /tmp/logs/install_step5.html -s -w "%{http_code}" \
-X POST "${DOCKER_WEB_CONTAINER_BASE_URL}/install/step5.php" \
--data "testpost=ok&action=set&selectlang=fr_FR&pass=${DOLI_DB_PASSWORD}&pass_verif=${DOLI_DB_PASSWORD}" \
> /tmp/logs/install_step5.status
set -e
if ! grep -q 200 /tmp/logs/install_step5.status; then
log "Something went wrong during Dolibarr administration setup. Check the logs for details: $(cat /tmp/logs/install_step5.html)"
exit 1
fi
if [ ! -f /var/www/documents/install.lock ]; then
log 'Something went wrong during Dolibarr install. Check the logs for details.'
exit 1
fi
else
log "Dolibarr already installed: $(cat /var/www/documents/install.lock)"
fi
log "Check Dolibarr app home page..."
wget "${DOCKER_WEB_CONTAINER_BASE_URL}"
fi
################################################################################
# Success
echo "Docker app '${DOCKER_TEST_CONTAINER}' tests finished"
echo 'Check the CI reports and logs for details.'
exit 0