Wavyzz/dolibarr-docker-fork
2
0
Fork 0
forked from Wavyzz/dolibarr-docker
Code Pull Requests Actions Activity

Allow change ID of user and group www-data

Browse Source
This commit is contained in:
Garcia M
2017-03-03 19:23:31 +01:00
parent 888b7a7b70
commit 9619f01a26
16 changed files with 109 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile.template
View File

@@ -13,6 +13,9 @@ ENV DOLI_ADMIN_LOGIN admin
ENV DOLI_ADMON_PASSWORD admin
ENV DOLI_URL_ROOT 'http://localhost'
ENV WWW_USER_ID ''
ENV WWW_GROUP_ID ''
ENV PHP_INI_DATE_TIMEZONE 'UTC'
RUN apt-get update -q && apt-get upgrade -yq \
@@ -33,9 +36,8 @@ ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/doliba
RUN unzip -q /tmp/dolibarr.zip -d /tmp/dolibarr
RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && rm -rf /tmp/dolibarr
RUN chown -R www-data:www-data /var/www/
VOLUME /var/www/documents
VOLUME /var/www/html/conf
EXPOSE 80

2
README.md
View File

@@ -58,3 +58,5 @@ Then run all services `docker-compose up -d`. Now, go to http://0.0.0.0 to acces
| **DOLI_ADMON_PASSWORD** | *admin* | Admin'password
| **DOLI_URL_ROOT** | *http://localhost* | Url root of the Dolibarr installation
| **PHP_INI_DATE_TIMEZONE** | *UTC* | Default timezone on PHP
| **WWW_USER_ID** | | ID of user www-data. ID will not changed if leave empty. During a development, it is very practical to put the same ID as the host user.
| **WWW_GROUP_ID** | | ID of group www-data. ID will not changed if leave empty.

2
docker-compose.yml
View File

@@ -22,6 +22,8 @@ web:
DOLI_DB_PASSWORD: root
DOLI_DB_NAME: dolibarr
DOLI_URL_ROOT: 'http://0.0.0.0'
WWW_USER_ID: 1000
WWW_GROUP_ID: 1000
ports:
- "80:80"
links:

13
docker-run.sh
View File

@@ -67,8 +67,17 @@ if [ $? -ne 0 ]; then
\$dolibarr_main_db_type='mysqli';
EOF
touch /var/www/documents/install.lock
chown www-data:www-data /var/www/html/conf/conf.php && chmod 400 /var/www/html/conf/conf.php
if [ "$WWW_USER_ID" != "" ]; then
usermod -u $WWW_USER_ID www-data
fi
if [ "$WWW_GROUP_ID" != "" ]; then
groupmod -g $WWW_GROUP_ID www-data
fi
touch /var/www/documents/install.lock
chown -R www-data:www-data /var/www
chmod 400 /var/www/html/conf/conf.php
chmod 400 /var/www/documents/install.lock
cat <<EOF > /usr/local/etc/php/php.ini

6
images/4.0.0/Dockerfile
View File

@@ -13,6 +13,9 @@ ENV DOLI_ADMIN_LOGIN admin
ENV DOLI_ADMON_PASSWORD admin
ENV DOLI_URL_ROOT 'http://localhost'
ENV WWW_USER_ID ''
ENV WWW_GROUP_ID ''
ENV PHP_INI_DATE_TIMEZONE 'UTC'
RUN apt-get update -q && apt-get upgrade -yq \
@@ -33,9 +36,8 @@ ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/doliba
RUN unzip -q /tmp/dolibarr.zip -d /tmp/dolibarr
RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && rm -rf /tmp/dolibarr
RUN chown -R www-data:www-data /var/www/
VOLUME /var/www/documents
VOLUME /var/www/html/conf
EXPOSE 80

13
images/4.0.0/docker-run.sh
View File

@@ -67,8 +67,17 @@ if [ $? -ne 0 ]; then
\$dolibarr_main_db_type='mysqli';
EOF
touch /var/www/documents/install.lock
chown www-data:www-data /var/www/html/conf/conf.php && chmod 400 /var/www/html/conf/conf.php
if [ "$WWW_USER_ID" != "" ]; then
usermod -u $WWW_USER_ID www-data
fi
if [ "$WWW_GROUP_ID" != "" ]; then
groupmod -g $WWW_GROUP_ID www-data
fi
touch /var/www/documents/install.lock
chown -R www-data:www-data /var/www
chmod 400 /var/www/html/conf/conf.php
chmod 400 /var/www/documents/install.lock
cat <<EOF > /usr/local/etc/php/php.ini

6
images/4.0.1/Dockerfile
View File

@@ -13,6 +13,9 @@ ENV DOLI_ADMIN_LOGIN admin
ENV DOLI_ADMON_PASSWORD admin
ENV DOLI_URL_ROOT 'http://localhost'
ENV WWW_USER_ID ''
ENV WWW_GROUP_ID ''
ENV PHP_INI_DATE_TIMEZONE 'UTC'
RUN apt-get update -q && apt-get upgrade -yq \
@@ -33,9 +36,8 @@ ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/doliba
RUN unzip -q /tmp/dolibarr.zip -d /tmp/dolibarr
RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && rm -rf /tmp/dolibarr
RUN chown -R www-data:www-data /var/www/
VOLUME /var/www/documents
VOLUME /var/www/html/conf
EXPOSE 80

13
images/4.0.1/docker-run.sh
View File

@@ -67,8 +67,17 @@ if [ $? -ne 0 ]; then
\$dolibarr_main_db_type='mysqli';
EOF
touch /var/www/documents/install.lock
chown www-data:www-data /var/www/html/conf/conf.php && chmod 400 /var/www/html/conf/conf.php
if [ "$WWW_USER_ID" != "" ]; then
usermod -u $WWW_USER_ID www-data
fi
if [ "$WWW_GROUP_ID" != "" ]; then
groupmod -g $WWW_GROUP_ID www-data
fi
touch /var/www/documents/install.lock
chown -R www-data:www-data /var/www
chmod 400 /var/www/html/conf/conf.php
chmod 400 /var/www/documents/install.lock
cat <<EOF > /usr/local/etc/php/php.ini

6
images/4.0.2/Dockerfile
View File

@@ -13,6 +13,9 @@ ENV DOLI_ADMIN_LOGIN admin
ENV DOLI_ADMON_PASSWORD admin
ENV DOLI_URL_ROOT 'http://localhost'
ENV WWW_USER_ID ''
ENV WWW_GROUP_ID ''
ENV PHP_INI_DATE_TIMEZONE 'UTC'
RUN apt-get update -q && apt-get upgrade -yq \
@@ -33,9 +36,8 @@ ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/doliba
RUN unzip -q /tmp/dolibarr.zip -d /tmp/dolibarr
RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && rm -rf /tmp/dolibarr
RUN chown -R www-data:www-data /var/www/
VOLUME /var/www/documents
VOLUME /var/www/html/conf
EXPOSE 80

13
images/4.0.2/docker-run.sh
View File

@@ -67,8 +67,17 @@ if [ $? -ne 0 ]; then
\$dolibarr_main_db_type='mysqli';
EOF
touch /var/www/documents/install.lock
chown www-data:www-data /var/www/html/conf/conf.php && chmod 400 /var/www/html/conf/conf.php
if [ "$WWW_USER_ID" != "" ]; then
usermod -u $WWW_USER_ID www-data
fi
if [ "$WWW_GROUP_ID" != "" ]; then
groupmod -g $WWW_GROUP_ID www-data
fi
touch /var/www/documents/install.lock
chown -R www-data:www-data /var/www
chmod 400 /var/www/html/conf/conf.php
chmod 400 /var/www/documents/install.lock
cat <<EOF > /usr/local/etc/php/php.ini

6
images/4.0.3/Dockerfile
View File

@@ -13,6 +13,9 @@ ENV DOLI_ADMIN_LOGIN admin
ENV DOLI_ADMON_PASSWORD admin
ENV DOLI_URL_ROOT 'http://localhost'
ENV WWW_USER_ID ''
ENV WWW_GROUP_ID ''
ENV PHP_INI_DATE_TIMEZONE 'UTC'
RUN apt-get update -q && apt-get upgrade -yq \
@@ -33,9 +36,8 @@ ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/doliba
RUN unzip -q /tmp/dolibarr.zip -d /tmp/dolibarr
RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && rm -rf /tmp/dolibarr
RUN chown -R www-data:www-data /var/www/
VOLUME /var/www/documents
VOLUME /var/www/html/conf
EXPOSE 80

13
images/4.0.3/docker-run.sh
View File

@@ -67,8 +67,17 @@ if [ $? -ne 0 ]; then
\$dolibarr_main_db_type='mysqli';
EOF
touch /var/www/documents/install.lock
chown www-data:www-data /var/www/html/conf/conf.php && chmod 400 /var/www/html/conf/conf.php
if [ "$WWW_USER_ID" != "" ]; then
usermod -u $WWW_USER_ID www-data
fi
if [ "$WWW_GROUP_ID" != "" ]; then
groupmod -g $WWW_GROUP_ID www-data
fi
touch /var/www/documents/install.lock
chown -R www-data:www-data /var/www
chmod 400 /var/www/html/conf/conf.php
chmod 400 /var/www/documents/install.lock
cat <<EOF > /usr/local/etc/php/php.ini

6
images/4.0.4/Dockerfile
View File

@@ -13,6 +13,9 @@ ENV DOLI_ADMIN_LOGIN admin
ENV DOLI_ADMON_PASSWORD admin
ENV DOLI_URL_ROOT 'http://localhost'
ENV WWW_USER_ID ''
ENV WWW_GROUP_ID ''
ENV PHP_INI_DATE_TIMEZONE 'UTC'
RUN apt-get update -q && apt-get upgrade -yq \
@@ -33,9 +36,8 @@ ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/doliba
RUN unzip -q /tmp/dolibarr.zip -d /tmp/dolibarr
RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && rm -rf /tmp/dolibarr
RUN chown -R www-data:www-data /var/www/
VOLUME /var/www/documents
VOLUME /var/www/html/conf
EXPOSE 80

13
images/4.0.4/docker-run.sh
View File

@@ -67,8 +67,17 @@ if [ $? -ne 0 ]; then
\$dolibarr_main_db_type='mysqli';
EOF
touch /var/www/documents/install.lock
chown www-data:www-data /var/www/html/conf/conf.php && chmod 400 /var/www/html/conf/conf.php
if [ "$WWW_USER_ID" != "" ]; then
usermod -u $WWW_USER_ID www-data
fi
if [ "$WWW_GROUP_ID" != "" ]; then
groupmod -g $WWW_GROUP_ID www-data
fi
touch /var/www/documents/install.lock
chown -R www-data:www-data /var/www
chmod 400 /var/www/html/conf/conf.php
chmod 400 /var/www/documents/install.lock
cat <<EOF > /usr/local/etc/php/php.ini

6
images/5.0.0/Dockerfile
View File

@@ -13,6 +13,9 @@ ENV DOLI_ADMIN_LOGIN admin
ENV DOLI_ADMON_PASSWORD admin
ENV DOLI_URL_ROOT 'http://localhost'
ENV WWW_USER_ID ''
ENV WWW_GROUP_ID ''
ENV PHP_INI_DATE_TIMEZONE 'UTC'
RUN apt-get update -q && apt-get upgrade -yq \
@@ -33,9 +36,8 @@ ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/doliba
RUN unzip -q /tmp/dolibarr.zip -d /tmp/dolibarr
RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && rm -rf /tmp/dolibarr
RUN chown -R www-data:www-data /var/www/
VOLUME /var/www/documents
VOLUME /var/www/html/conf
EXPOSE 80

13
images/5.0.0/docker-run.sh
View File

@@ -67,8 +67,17 @@ if [ $? -ne 0 ]; then
\$dolibarr_main_db_type='mysqli';
EOF
touch /var/www/documents/install.lock
chown www-data:www-data /var/www/html/conf/conf.php && chmod 400 /var/www/html/conf/conf.php
if [ "$WWW_USER_ID" != "" ]; then
usermod -u $WWW_USER_ID www-data
fi
if [ "$WWW_GROUP_ID" != "" ]; then
groupmod -g $WWW_GROUP_ID www-data
fi
touch /var/www/documents/install.lock
chown -R www-data:www-data /var/www
chmod 400 /var/www/html/conf/conf.php
chmod 400 /var/www/documents/install.lock
cat <<EOF > /usr/local/etc/php/php.ini