Skip to content

Commit

Permalink
Update README
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Nov 8, 2024
1 parent 1274adf commit 1cee139
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 31 deletions.
48 changes: 24 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ services:
mariadb:
image: mariadb:latest
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: dolibarr
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-root}
MYSQL_DATABASE: ${MYSQL_DATABASE:-dolibarr}
volumes:
- /home/dolibarr_mariadb:/var/lib/mysql

Expand All @@ -56,16 +56,16 @@ services:
# dolibarr/dolibarr:x.y.z
image: dolibarr/dolibarr:latest
environment:
DOLI_DB_HOST: mariadb
DOLI_DB_USER: root
DOLI_DB_PASSWORD: root
DOLI_DB_NAME: dolibarr
DOLI_URL_ROOT: 'http://0.0.0.0'
DOLI_ADMIN_LOGIN: 'admin'
DOLI_ADMIN_PASSWORD: 'admin'
DOLI_INIT_DEMO: 0
WWW_USER_ID: 1000
WWW_GROUP_ID: 1000
DOLI_DB_HOST: ${DOLI_DB_HOST:-mariadb}
DOLI_DB_USER: ${DOLI_DB_USER:-root}
DOLI_DB_PASSWORD: ${DOLI_DB_PASSWORD:-root}
DOLI_DB_NAME: ${DOLI_DB_NAME:-dolibarr}
DOLI_URL_ROOT: "${DOLI_URL_ROOT:-http://0.0.0.0}"
DOLI_ADMIN_LOGIN: "${DOLI_ADMIN_LOGIN:-admin}"
DOLI_ADMIN_PASSWORD: "${DOLI_ADMIN_PASSWORD:-admin}"
DOLI_INIT_DEMO: ${DOLI_INIT_DEMO:-0}
WWW_USER_ID: ${WWW_USER_ID:-1000}
WWW_GROUP_ID: ${WWW_GROUP_ID:-1000}
ports:
- "80:80"
links:
Expand Down Expand Up @@ -201,8 +201,8 @@ services:
mariadb:
image: mariadb:latest
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: dolibarr
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-root}
MYSQL_DATABASE: ${MYSQL_DATABASE:-dolibarr}
web:
# Choose the version of image to install
Expand All @@ -211,16 +211,16 @@ services:
# dolibarr/dolibarr:x.y.z
image: dolibarr/dolibarr
environment:
DOLI_DB_HOST: mariadb
DOLI_DB_USER: root
DOLI_DB_PASSWORD: root
DOLI_DB_NAME: dolibarr
DOLI_URL_ROOT: 'http://0.0.0.0'
DOLI_ADMIN_LOGIN: 'admin'
DOLI_ADMIN_PASSWORD: 'admin'
DOLI_INIT_DEMO: 0
WWW_USER_ID: 1000
WWW_GROUP_ID: 1000
DOLI_DB_HOST: ${DOLI_DB_HOST:-mariadb}
DOLI_DB_USER: ${DOLI_DB_USER:-root}
DOLI_DB_PASSWORD: ${DOLI_DB_PASSWORD:-root}
DOLI_DB_NAME: ${DOLI_DB_NAME:-dolibarr}
DOLI_URL_ROOT: "${DOLI_URL_ROOT:-http://0.0.0.0}"
DOLI_ADMIN_LOGIN: "${DOLI_ADMIN_LOGIN:-admin}"
DOLI_ADMIN_PASSWORD: "${DOLI_ADMIN_PASSWORD:-admin}"
DOLI_INIT_DEMO: ${DOLI_INIT_DEMO:-0}
WWW_USER_ID: ${WWW_USER_ID:-1000}
WWW_GROUP_ID: ${WWW_GROUP_ID:-1000}
volumes :
- volume-scripts:/var/www/scripts/docker-init.d
- before-starting-scripts:/var/www/scripts/before-starting.d
Expand Down
3 changes: 2 additions & 1 deletion images/15.0.3-php7.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \
mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \
chown -R www-data:www-data /var/www
chown -R www-data:www-data /var/www && \
chmod -R u-w /var/www/html

EXPOSE 80
VOLUME /var/www/documents
Expand Down
3 changes: 2 additions & 1 deletion images/16.0.5-php8.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \
mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \
chown -R www-data:www-data /var/www
chown -R www-data:www-data /var/www && \
chmod -R u-w /var/www/html

EXPOSE 80
VOLUME /var/www/documents
Expand Down
3 changes: 2 additions & 1 deletion images/17.0.4-php8.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \
mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \
chown -R www-data:www-data /var/www
chown -R www-data:www-data /var/www && \
chmod -R u-w /var/www/html

EXPOSE 80
VOLUME /var/www/documents
Expand Down
3 changes: 2 additions & 1 deletion images/18.0.5-php8.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \
mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \
chown -R www-data:www-data /var/www
chown -R www-data:www-data /var/www && \
chmod -R u-w /var/www/html

EXPOSE 80
VOLUME /var/www/documents
Expand Down
3 changes: 2 additions & 1 deletion images/19.0.3-php8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \
mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \
chown -R www-data:www-data /var/www
chown -R www-data:www-data /var/www && \
chmod -R u-w /var/www/html

EXPOSE 80
VOLUME /var/www/documents
Expand Down
3 changes: 2 additions & 1 deletion images/20.0.1-php8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \
mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \
chown -R www-data:www-data /var/www
chown -R www-data:www-data /var/www && \
chmod -R u-w /var/www/html

EXPOSE 80
VOLUME /var/www/documents
Expand Down
3 changes: 2 additions & 1 deletion images/develop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \
mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \
chown -R www-data:www-data /var/www
chown -R www-data:www-data /var/www && \
chmod -R u-w /var/www/html

EXPOSE 80
VOLUME /var/www/documents
Expand Down

0 comments on commit 1cee139

Please sign in to comment.