fixes

Makefile

@@ -260,3 +260,12 @@ bundle-atlassian:
 	cd `pwd`/linux/ecosystem/atlassian/fisheye/latest             && pwd && make
 	cd `pwd`/linux/ecosystem/atlassian/fisheye-crucible/latest    && pwd && make
 	cd `pwd`/linux/ecosystem/atlassian/jira/latest                && pwd && make
+
+bundle-web:
+	@echo "======================================="
+	@echo "=====   Building    web    images ====="
+	@echo "======================================="
+	make ecosystem-php-images
+	make ecosystem-apache2-images
+	make ecosystem-nginx-images
+	

linux/ecosystem/apache2/latest/Dockerfile

@@ -99,14 +99,17 @@ RUN apt clean -y && \
     rm -rfv /tmp/composer-setup.php && \
     rm -rfv /tmp/ioncube.tar.gz
 
-#volumes
+#healthcheck. good practice
-VOLUME ["/var/www"]
+HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
 
 # Add image configuration and scripts
-COPY run.sh /run.sh
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
-RUN chmod 755 /*.sh
+RUN chmod 755 /usr/bin/docker-entrypoint.sh
 
-# Configure application
+#Final config
-EXPOSE 80
+VOLUME ["/var/www"]
 WORKDIR /var/www/
-CMD ["/run.sh"]
+EXPOSE 80 443
+
+ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
+CMD ["docker-entrypoint.sh"]

linux/ecosystem/apache2/php7.2/Dockerfile

@@ -92,14 +92,17 @@ RUN apt clean -y && \
     rm -rfv /tmp/composer-setup.php && \
     rm -rfv /tmp/ioncube.tar.gz
 
-#volumes
+#healthcheck. good practice
-VOLUME ["/var/www"]
+HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
 
 # Add image configuration and scripts
-COPY run.sh /run.sh
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
-RUN chmod 755 /*.sh
+RUN chmod 755 /usr/bin/docker-entrypoint.sh
 
-# Configure application
+#Final config
-EXPOSE 80
+VOLUME ["/var/www"]
 WORKDIR /var/www/
-CMD ["/run.sh"]
+EXPOSE 80 443
+
+ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
+CMD ["docker-entrypoint.sh"]

linux/ecosystem/apache2/php7.3/Dockerfile

@@ -92,14 +92,17 @@ RUN apt clean -y && \
     rm -rfv /tmp/composer-setup.php && \
     rm -rfv /tmp/ioncube.tar.gz
 
-#volumes
+#healthcheck. good practice
-VOLUME ["/var/www"]
+HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
 
 # Add image configuration and scripts
-COPY run.sh /run.sh
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
-RUN chmod 755 /*.sh
+RUN chmod 755 /usr/bin/docker-entrypoint.sh
 
-# Configure application
+#Final config
-EXPOSE 80
+VOLUME ["/var/www"]
 WORKDIR /var/www/
-CMD ["/run.sh"]
+EXPOSE 80 443
+
+ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
+CMD ["docker-entrypoint.sh"]

linux/ecosystem/apache2/php7.4/Dockerfile

@@ -99,14 +99,17 @@ RUN apt clean -y && \
     rm -rfv /tmp/composer-setup.php && \
     rm -rfv /tmp/ioncube.tar.gz
 
-#volumes
+#healthcheck. good practice
-VOLUME ["/var/www"]
+HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
 
 # Add image configuration and scripts
-COPY run.sh /run.sh
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
-RUN chmod 755 /*.sh
+RUN chmod 755 /usr/bin/docker-entrypoint.sh
 
-# Configure application
+#Final config
-EXPOSE 80
+VOLUME ["/var/www"]
 WORKDIR /var/www/
-CMD ["/run.sh"]
+EXPOSE 80 443
+
+ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
+CMD ["docker-entrypoint.sh"]

linux/ecosystem/apache2/php8.0/Dockerfile

@@ -100,14 +100,17 @@ RUN apt clean -y && \
     rm -rfv /tmp/composer-setup.php && \
     rm -rfv /tmp/ioncube.tar.gz
 
-#volumes
+#healthcheck. good practice
-VOLUME ["/var/www"]
+HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
 
 # Add image configuration and scripts
-COPY run.sh /run.sh
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
-RUN chmod 755 /*.sh
+RUN chmod 755 /usr/bin/docker-entrypoint.sh
 
-# Configure application
+#Final config
-EXPOSE 80
+VOLUME ["/var/www"]
 WORKDIR /var/www/
-CMD ["/run.sh"]
+EXPOSE 80 443
+
+ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
+CMD ["docker-entrypoint.sh"]

linux/ecosystem/nginx/latest/main/Dockerfile

@@ -239,8 +239,16 @@ RUN apt-get update && \
     rm -rf /builds/* && \
     rm -rf /valve/*
 
+#healthcheck. good practice
+HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
+
+# Add image configuration and scripts
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
+RUN chmod 755 /usr/bin/docker-entrypoint.sh
+
 #Final config
 VOLUME ["/var/cache/nginx"]
 EXPOSE 80 443
 
-CMD ["nginx", "-g", "daemon off;"]
+ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
+CMD ["docker-entrypoint.sh"]

linux/ecosystem/nginx/latest/main/docker-entrypoint.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [[ -z "${FIX_WWW_DATA}" ]]; then
+  echo "[nginx] env FIX_WWW_DATA is not set. Skipping..."
+elif [ "${FIX_WWW_DATA}" == "false" ]; then
+  echo "[nginx] env FIX_WWW_DATA is set to false. Skipping..."
+elif  [ "${FIX_WWW_DATA}" == "true" ]; then
+  echo "[nginx] Changing permissions for /var/www path. Dont worry, please wait."
+  chown www-data:www-data /var/www -R
+  echo "[nginx] Done"
+else
+  echo "[nginx] env FIX_WWW_DATA is set to strange value. Skipping..."
+fi
+
+echo "[nginx] Starting up"
+nginx -g 'daemon off;'

linux/ecosystem/nginx/latest/php/Dockerfile

@@ -250,8 +250,16 @@ RUN apt clean -y && \
     rm -rfv /tmp/composer-setup.php && \
     rm -rfv /tmp/ioncube.tar.gz
 
+#healthcheck. good practice
+HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
+
+# Add image configuration and scripts
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
+RUN chmod 755 /usr/bin/docker-entrypoint.sh
+
 #Final config
 VOLUME ["/var/cache/nginx"]
 EXPOSE 80 443
 
-CMD ["nginx", "-g", "daemon off;"]
+ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
+CMD ["docker-entrypoint.sh"]

linux/ecosystem/nginx/latest/php/docker-entrypoint.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [[ -z "${FIX_WWW_DATA}" ]]; then
+  echo "[nginx] env FIX_WWW_DATA is not set. Skipping..."
+elif [ "${FIX_WWW_DATA}" == "false" ]; then
+  echo "[nginx] env FIX_WWW_DATA is set to false. Skipping..."
+elif  [ "${FIX_WWW_DATA}" == "true" ]; then
+  echo "[nginx] Changing permissions for /var/www path. Dont worry, please wait."
+  chown www-data:www-data /var/www -R
+  echo "[nginx] Done"
+else
+  echo "[nginx] env FIX_WWW_DATA is set to strange value. Skipping..."
+fi
+
+echo "[nginx] Starting up"
+nginx -g 'daemon off;'

linux/ecosystem/nginx/latest/quic/docker-entrypoint.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [[ -z "${FIX_WWW_DATA}" ]]; then
+  echo "[nginx] env FIX_WWW_DATA is not set. Skipping..."
+elif [ "${FIX_WWW_DATA}" == "false" ]; then
+  echo "[nginx] env FIX_WWW_DATA is set to false. Skipping..."
+elif  [ "${FIX_WWW_DATA}" == "true" ]; then
+  echo "[nginx] Changing permissions for /var/www path. Dont worry, please wait."
+  chown www-data:www-data /var/www -R
+  echo "[nginx] Done"
+else
+  echo "[nginx] env FIX_WWW_DATA is set to strange value. Skipping..."
+fi
+
+echo "[nginx] Starting up"
+nginx -g 'daemon off;'

linux/ecosystem/nginx/latest/rtmp-hls/Dockerfile

@@ -38,7 +38,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
     libx264-dev \
     libx265-dev
 
-
 ##################################################################
 #                   stretch  sources list + libvpx
 ##################################################################
@@ -49,7 +48,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
     apt-get install -y --allow-unauthenticated \
     libvpx4
 
-
 ##################################################################
 #                   buster sources list + libvpx
 ##################################################################
@@ -60,7 +58,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
     apt-get install -y --allow-unauthenticated \
     libvpx5
 
-
 ##################################################################
 #                   sid sources list + libvpx
 ##################################################################
@@ -71,7 +68,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
     apt-get install -y --allow-unauthenticated \
     libvpx6
 
-
 ##################################################################
 #                   installing deps for rtmp module
 ##################################################################
@@ -120,8 +116,16 @@ RUN apt clean -y && \
     rm -rfv /var/lib/apt/lists/* && \
     rm -rfv /var/cache/apt/archives/*.deb
 
+#healthcheck. good practice
+HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
 
-EXPOSE 1935
+# Add image configuration and scripts
-EXPOSE 8080
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
+RUN chmod 755 /usr/bin/docker-entrypoint.sh
 
-CMD ["nginx", "-g", "daemon off;"]
+#Final config
+VOLUME ["/var/cache/nginx"]
+EXPOSE 80 443 1935 8080
+
+ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
+CMD ["docker-entrypoint.sh"]

linux/ecosystem/nginx/latest/rtmp-hls/docker-entrypoint.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [[ -z "${FIX_WWW_DATA}" ]]; then
+  echo "[nginx] env FIX_WWW_DATA is not set. Skipping..."
+elif [ "${FIX_WWW_DATA}" == "false" ]; then
+  echo "[nginx] env FIX_WWW_DATA is set to false. Skipping..."
+elif  [ "${FIX_WWW_DATA}" == "true" ]; then
+  echo "[nginx] Changing permissions for /var/www path. Dont worry, please wait."
+  chown www-data:www-data /var/www -R
+  echo "[nginx] Done"
+else
+  echo "[nginx] env FIX_WWW_DATA is set to strange value. Skipping..."
+fi
+
+echo "[nginx] Starting up"
+nginx -g 'daemon off;'

linux/ecosystem/testrail/ad/Dockerfile

@@ -7,7 +7,7 @@ ENV TESTRAIL_PLUGIN_FILE=${TESTRAIL_PLUGIN_FULLNAME}.zip
 ENV TESTRAIL_PLUGIN_DONWLOAD_URL=https://media.gurock.com/gk-media/downloads/${TESTRAIL_PLUGIN_FILE}
 ENV TESTRAIL_PLUGIN_TEMP=${TESTRAIL_RELEASE_DIR}/${TESTRAIL_PLUGIN_FILE}
 
-RUN rm -rfv /run.sh
+RUN rm -rfv /usr/bin/docker-entrypoint.sh
-COPY run.sh /run.sh
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
 
 RUN wget --no-check-certificate -O ${TESTRAIL_PLUGIN_TEMP} ${TESTRAIL_PLUGIN_DONWLOAD_URL}

linux/ecosystem/testrail/latest/Dockerfile

@@ -46,11 +46,18 @@ RUN \
   chown -R www-data:www-data ${TR_OPT_PATH} && \
   ls -las ${TR_OPT_PATH}
 
-
 COPY apache_testrail.conf ${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf
-COPY run.sh /run.sh
 
+#healthcheck. good practice
+HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
+
+# Add image configuration and scripts
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
+RUN chmod 755 /usr/bin/docker-entrypoint.sh
+
+#Final config
 WORKDIR /var/www/testrail
-EXPOSE 80
+EXPOSE 80 443
 
-CMD ["/run.sh"]
+ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
+CMD ["docker-entrypoint.sh"]

linux/ecosystem/testrail/ldap/Dockerfile

@@ -7,7 +7,7 @@ ENV TESTRAIL_PLUGIN_FILE=${TESTRAIL_PLUGIN_FULLNAME}.zip
 ENV TESTRAIL_PLUGIN_DONWLOAD_URL=https://media.gurock.com/gk-media/downloads/${TESTRAIL_PLUGIN_FILE}
 ENV TESTRAIL_PLUGIN_TEMP=${TESTRAIL_RELEASE_DIR}/${TESTRAIL_PLUGIN_FILE}
 
-RUN rm -rfv /run.sh
+RUN rm -rfv /usr/bin/docker-entrypoint.sh
-COPY run.sh /run.sh
+COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
 
 RUN wget --no-check-certificate -O ${TESTRAIL_PLUGIN_TEMP} ${TESTRAIL_PLUGIN_DONWLOAD_URL}

linux/ecosystem/torrserver/Dockerfile

@@ -24,4 +24,7 @@ EXPOSE \
 VOLUME \
   /config
 
+#healthcheck. good practice
+HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:${UI_PORT}/ || exit 1
+
 ENTRYPOINT /opt/torrServer --port $UI_PORT -path /config