Merge branch 'nurlanf-master'

JonBendtsen · Nov 1, 2019 · b5106db · b5106db
2 parents ee0c925 + 7be13b5
commit b5106db
Show file tree

Hide file tree

Showing 27 changed files with 457 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,8 @@ Docker image for Dolibarr with auto installer on first boot.
 * 6.0.8 6.0.8-php7.0 6.0.8-php7.1 
 * 7.0.5 7.0.5-php7.0 7.0.5-php7.1 
 * 8.0.4 8.0.4-php7.0 8.0.4-php7.1 
-* 9.0.0 9.0.0-php7.0 9.0.0-php7.1 
+* 9.0.4 9.0.4-php7.0 9.0.4-php7.1 
+* 10.0.3 10.0.3-php7.0 10.0.3-php7.1 
 
 
 ## What is Dolibarr ?

diff --git a/docker-run.sh b/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/10.0.3-php7.0/Dockerfile b/images/10.0.3-php7.0/Dockerfile
@@ -0,0 +1,48 @@
+FROM php:7.0-apache-stretch
+
+MAINTAINER Garcia MICHEL <[email protected]>
+
+ENV DOLI_VERSION 10.0.3
+
+ENV DOLI_INSTALL_AUTO 1
+
+ENV DOLI_DB_HOST mysql
+ENV DOLI_DB_USER doli
+ENV DOLI_DB_PASSWORD doli_pass
+ENV DOLI_DB_NAME dolidb
+
+ENV DOLI_ADMIN_LOGIN admin
+ENV DOLI_ADMIN_PASSWORD admin
+ENV DOLI_URL_ROOT 'http://localhost'
+ENV DOLI_NOCSRFCHECK 0
+
+ENV WWW_USER_ID 33
+ENV WWW_GROUP_ID 33
+
+ENV PHP_INI_DATE_TIMEZONE 'UTC'
+
+RUN apt-get update -q && apt-get upgrade -yq \
+	&& apt-get install -yq \
+		libpng-dev \
+		libjpeg-dev \
+        libldap2-dev \
+    libxml2-dev \
+    mysql-client \
+		unzip \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install mysqli pdo pdo_mysql gd soap zip \
+    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+    && docker-php-ext-install ldap
+
+# Get Dolibarr
+ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/dolibarr.zip
+RUN unzip -q /tmp/dolibarr.zip -d /tmp/dolibarr
+RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && ln -s /var/www/html /var/www/htdocs
+RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/scripts /var/www/
+RUN rm -rf /tmp/dolibarr
+
+EXPOSE 80
+
+COPY docker-run.sh /usr/local/bin/
+ENTRYPOINT ["docker-run.sh"]
diff --git a/images/9.0.0/docker-run.sh → images/10.0.3-php7.0/docker-run.sh b/images/9.0.0/docker-run.sh → images/10.0.3-php7.0/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/10.0.3-php7.1/Dockerfile b/images/10.0.3-php7.1/Dockerfile
@@ -0,0 +1,48 @@
+FROM php:7.1-apache-stretch
+
+MAINTAINER Garcia MICHEL <[email protected]>
+
+ENV DOLI_VERSION 10.0.3
+
+ENV DOLI_INSTALL_AUTO 1
+
+ENV DOLI_DB_HOST mysql
+ENV DOLI_DB_USER doli
+ENV DOLI_DB_PASSWORD doli_pass
+ENV DOLI_DB_NAME dolidb
+
+ENV DOLI_ADMIN_LOGIN admin
+ENV DOLI_ADMIN_PASSWORD admin
+ENV DOLI_URL_ROOT 'http://localhost'
+ENV DOLI_NOCSRFCHECK 0
+
+ENV WWW_USER_ID 33
+ENV WWW_GROUP_ID 33
+
+ENV PHP_INI_DATE_TIMEZONE 'UTC'
+
+RUN apt-get update -q && apt-get upgrade -yq \
+	&& apt-get install -yq \
+		libpng-dev \
+		libjpeg-dev \
+        libldap2-dev \
+    libxml2-dev \
+    mysql-client \
+		unzip \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install mysqli pdo pdo_mysql gd soap zip \
+    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+    && docker-php-ext-install ldap
+
+# Get Dolibarr
+ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/dolibarr.zip
+RUN unzip -q /tmp/dolibarr.zip -d /tmp/dolibarr
+RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && ln -s /var/www/html /var/www/htdocs
+RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/scripts /var/www/
+RUN rm -rf /tmp/dolibarr
+
+EXPOSE 80
+
+COPY docker-run.sh /usr/local/bin/
+ENTRYPOINT ["docker-run.sh"]
diff --git a/images/9.0.0-php7.0/docker-run.sh → images/10.0.3-php7.1/docker-run.sh b/images/9.0.0-php7.0/docker-run.sh → images/10.0.3-php7.1/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/10.0.3/Dockerfile b/images/10.0.3/Dockerfile
@@ -0,0 +1,48 @@
+FROM php:5.6-apache-stretch
+
+MAINTAINER Garcia MICHEL <[email protected]>
+
+ENV DOLI_VERSION 10.0.3
+
+ENV DOLI_INSTALL_AUTO 1
+
+ENV DOLI_DB_HOST mysql
+ENV DOLI_DB_USER doli
+ENV DOLI_DB_PASSWORD doli_pass
+ENV DOLI_DB_NAME dolidb
+
+ENV DOLI_ADMIN_LOGIN admin
+ENV DOLI_ADMIN_PASSWORD admin
+ENV DOLI_URL_ROOT 'http://localhost'
+ENV DOLI_NOCSRFCHECK 0
+
+ENV WWW_USER_ID 33
+ENV WWW_GROUP_ID 33
+
+ENV PHP_INI_DATE_TIMEZONE 'UTC'
+
+RUN apt-get update -q && apt-get upgrade -yq \
+	&& apt-get install -yq \
+		libpng-dev \
+		libjpeg-dev \
+        libldap2-dev \
+    libxml2-dev \
+    mysql-client \
+		unzip \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install mysqli pdo pdo_mysql gd soap zip \
+    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+    && docker-php-ext-install ldap
+
+# Get Dolibarr
+ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/dolibarr.zip
+RUN unzip -q /tmp/dolibarr.zip -d /tmp/dolibarr
+RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && ln -s /var/www/html /var/www/htdocs
+RUN cp -r /tmp/dolibarr/dolibarr-${DOLI_VERSION}/scripts /var/www/
+RUN rm -rf /tmp/dolibarr
+
+EXPOSE 80
+
+COPY docker-run.sh /usr/local/bin/
+ENTRYPOINT ["docker-run.sh"]
diff --git a/images/9.0.0-php7.1/docker-run.sh → images/10.0.3/docker-run.sh b/images/9.0.0-php7.1/docker-run.sh → images/10.0.3/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/5.0.7-php7.0/docker-run.sh b/images/5.0.7-php7.0/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/5.0.7-php7.1/docker-run.sh b/images/5.0.7-php7.1/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/5.0.7/docker-run.sh b/images/5.0.7/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/6.0.8-php7.0/docker-run.sh b/images/6.0.8-php7.0/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/6.0.8-php7.1/docker-run.sh b/images/6.0.8-php7.1/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/6.0.8/docker-run.sh b/images/6.0.8/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/7.0.5-php7.0/docker-run.sh b/images/7.0.5-php7.0/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/7.0.5-php7.1/docker-run.sh b/images/7.0.5-php7.1/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/7.0.5/docker-run.sh b/images/7.0.5/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/8.0.4-php7.0/docker-run.sh b/images/8.0.4-php7.0/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/8.0.4-php7.1/docker-run.sh b/images/8.0.4-php7.1/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/8.0.4/docker-run.sh b/images/8.0.4/docker-run.sh
@@ -40,7 +40,7 @@ fi
 if [ $DOLI_INSTALL_AUTO -eq 1 ]; then
   r=1
   while [ $r -ne 0 ]; do
-    mysql -u $DOLI_DB_USER -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
+    mysql -u $DOLI_DB_USER --protocol tcp -p${DOLI_DB_PASSWORD} -h $DOLI_DB_HOST -e "status" > /dev/null 2>&1
     r=$?
     if [ $r -ne 0 ]; then
       echo "Waiting that SQL database is up..."

diff --git a/images/9.0.0-php7.0/Dockerfile → images/9.0.4-php7.0/Dockerfile b/images/9.0.0-php7.0/Dockerfile → images/9.0.4-php7.0/Dockerfile
@@ -2,7 +2,7 @@ FROM php:7.0-apache-stretch
 
 MAINTAINER Garcia MICHEL <[email protected]>
 
-ENV DOLI_VERSION 9.0.0
+ENV DOLI_VERSION 9.0.4
 
 ENV DOLI_INSTALL_AUTO 1