Update

2.3/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.1-apache
 
-# install extra packages
+# Install extra packages
 RUN apt-get update \
 	&& apt-get install -y \
 		graphviz \

2.4/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.1-apache
 
-# install extra packages
+# Install extra packages
 RUN apt-get update \
 	&& apt-get install -y \
 		graphviz \

2.5/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.1-apache
 
-# install extra packages
+# Install extra packages
 RUN apt-get update \
 	&& apt-get install -y \
 		graphviz \

2.6/Dockerfile

@@ -1,15 +1,14 @@
 FROM php:7.2-apache
 
-# add helper script
-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+# Add helper script
+COPY --from=mlocati/php-extension-installer:latest /usr/bin/install-php-extensions /usr/local/bin/
 
-# install extra packages
+# Install extra packages
 RUN apt-get update \
 	&& apt-get install -y \
 		graphviz \
 		mariadb-client \
 		unzip \
-	&& chmod uga+x /usr/local/bin/install-php-extensions \
 	&& install-php-extensions \
 		gd \
 		ldap \

2.7/Dockerfile

@@ -1,26 +1,26 @@
 FROM php:7.2-apache
 
-# load version info from arguments
+# Load version info from arguments
 ARG release
 ARG patch
 
-# add helper script
-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+# Add helper script
+COPY --from=mlocati/php-extension-installer:latest /usr/bin/install-php-extensions /usr/local/bin/
 
-# install extra packages
+# Install extra packages
+# hadolint ignore=DL3008,DL3009
 RUN apt-get update \
-	&& apt-get install -y \
+	&& apt-get install -y --no-install-recommends \
 		graphviz \
 		mariadb-client \
 		unzip \
-	&& chmod uga+x /usr/local/bin/install-php-extensions \
 	&& install-php-extensions \
 		gd \
 		ldap \
 		mcrypt \
 		mysqli \
 		soap \
-		zip 
+		zip
 
 # Load iTop files
 RUN curl -L -o /tmp/iTop.zip https://sourceforge.net/projects/itop/files/itop/${release}/iTop-${release}-${patch}.zip \

2.7/Makefile

@@ -1,17 +1,38 @@
-version = 2.7.7
+version = 2.7.11
 release = $(version)
-patch = 9622
+patch = 14870
+builder = itop_builder
+platforms = linux/arm64,linux/amd64
 
-all: build push
+all: setup_builder load
 
-build:
-	docker build --pull \
+setup_builder:
+	docker buildx inspect $(builder) > /dev/null || docker buildx create --name $(builder) --driver docker-container --platform $(platforms) --bootstrap
+
+build: setup_builder
+	# Build all supported platforms
+	docker buildx build --pull \
+		--builder $(builder) \
+		--platform $(platforms) \
+		--build-arg release=$(release) \
+		--build-arg patch=$(patch) .
+
+load: setup_builder
+	# Build and load current platform
+	docker buildx build --pull --load \
+		--builder $(builder) \
 		--build-arg release=$(release) \
 		--build-arg patch=$(patch) \
 		-t supervisions/itop:2.7 \
 		-t supervisions/itop:$(version) \
 		-t supervisions/itop:$(release) .
 
-push:
-	docker push supervisions/itop:2.7
-	docker push supervisions/itop:$(version)
+push: setup_builder
+	# Build and push all supported platforms
+	docker buildx build --pull --push \
+		--builder $(builder) \
+		--platform $(platforms) \
+		--build-arg release=$(release) \
+		--build-arg patch=$(patch) \
+		-t supervisions/itop:2.7 \
+		-t supervisions/itop:$(version) .

2.7/php.ini

@@ -1,3 +1,12 @@
+[Core]
+; iTop recommended value
+memory_limit = 256M
+; iTop security best practice
+zend.exception_ignore_args = true
+
 [Session]
 ; iTop wants save_path to be set
 session.save_path = "/tmp"
+; iTop security best practices
+session.cookie_httponly = true
+session.cookie_samesite = "Lax"

3.0/Dockerfile

@@ -1,27 +1,27 @@
 FROM php:7.4-apache
 
-# load version info from arguments
+# Load version info from arguments
 ARG release
 ARG patch
 
-# add helper script
-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+# Add helper script
+COPY --from=mlocati/php-extension-installer:latest /usr/bin/install-php-extensions /usr/local/bin/
 
-# install extra packages
+# Install extra packages
+# hadolint ignore=DL3008,DL3009
 RUN apt-get update \
-	&& apt-get install -y \
+	&& apt-get install -y --no-install-recommends \
 		graphviz \
 		mariadb-client \
 		unzip \
-	&& chmod uga+x /usr/local/bin/install-php-extensions \
 	&& install-php-extensions \
 		apcu \
 		gd \
 		ldap \
 		mcrypt \
 		mysqli \
 		soap \
-		zip 
+		zip
 
 # Load iTop files
 RUN curl -L -o /tmp/iTop.zip https://sourceforge.net/projects/itop/files/itop/${release}/iTop-${release}-${patch}.zip \

3.0/Makefile

@@ -1,19 +1,38 @@
-version = 3.0.2
-release = $(version)-1
-patch = 9957
+version = 3.0.4
+release = $(version)
+patch = 12690
+builder = itop_builder
+platforms = linux/arm64,linux/amd64
 
-all: build push
+all: setup_builder load
 
-build:
-	docker build --pull \
+setup_builder:
+	docker buildx inspect $(builder) > /dev/null || docker buildx create --name $(builder) --driver docker-container --platform $(platforms) --bootstrap
+
+build: setup_builder
+	# Build all supported platforms
+	docker buildx build --pull \
+		--builder $(builder) \
+		--platform $(platforms) \
+		--build-arg release=$(release) \
+		--build-arg patch=$(patch) .
+
+load: setup_builder
+	# Build and load current platform
+	docker buildx build --pull --load \
+		--builder $(builder) \
 		--build-arg release=$(release) \
 		--build-arg patch=$(patch) \
-		-t supervisions/itop \
 		-t supervisions/itop:3.0 \
 		-t supervisions/itop:$(version) \
 		-t supervisions/itop:$(release) .
 
-push:
-	docker push supervisions/itop
-	docker push supervisions/itop:3.0
-	docker push supervisions/itop:$(version)
+push: setup_builder
+	# Build and push all supported platforms
+	docker buildx build --pull --push \
+		--builder $(builder) \
+		--platform $(platforms) \
+		--build-arg release=$(release) \
+		--build-arg patch=$(patch) \
+		-t supervisions/itop:3.0 \
+		-t supervisions/itop:$(version) .

3.0/docker-itop-entrypoint

@@ -7,6 +7,6 @@ if [ "${1#-}" != "$1" ]; then
 fi
 
 # show iTop log messages in docker logs
-tail -F log/setup.log log/error.log log/deadlocks.log log/deprecated-calls.log log/tools.log > /dev/stderr &
+tail --pid 1 -n0 -F log/setup.log log/error.log log/deadlocks.log log/deprecated-calls.log log/tools.log > /dev/stderr &
 
 exec "$@"

3.0/php.ini

@@ -1,3 +1,12 @@
+[Core]
+; iTop recommended value
+memory_limit = 256M
+; iTop security best practice
+zend.exception_ignore_args = true
+
 [Session]
 ; iTop wants save_path to be set
 session.save_path = "/tmp"
+; iTop security best practices
+session.cookie_httponly = true
+session.cookie_samesite = "Lax"

3.1/Dockerfile

@@ -0,0 +1,45 @@
+FROM php:8.1-apache
+
+# Load version info from arguments
+ARG release
+ARG patch
+
+# Add helper script
+COPY --from=mlocati/php-extension-installer:latest /usr/bin/install-php-extensions /usr/local/bin/
+
+# Install extra packages
+# hadolint ignore=DL3008,DL3009
+RUN apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		graphviz \
+		mariadb-client \
+		unzip \
+	&& install-php-extensions \
+		apcu \
+		gd \
+		ldap \
+		mcrypt \
+		mysqli \
+		soap \
+		zip
+
+# Load iTop files
+RUN curl -L -o /tmp/iTop.zip https://sourceforge.net/projects/itop/files/itop/${release}/iTop-${release}-${patch}.zip \
+	&& unzip /tmp/iTop.zip -d /tmp/ web/* \
+	&& mv -v /tmp/web/* /var/www/html/ \
+	&& mkdir /var/www/html/env-production \
+	&& chown -R www-data: /var/www/html/ \
+	&& rm -rf /tmp/iTop.zip /tmp/web
+
+# Add default configuration
+COPY php.ini /usr/local/etc/php/php.ini
+COPY config-itop.php /var/www/html/conf/production/config-itop.php
+RUN chown -R www-data: /var/www/html/conf
+
+# Add custom entrypoint
+COPY docker-itop-entrypoint /usr/local/bin/
+ENTRYPOINT ["docker-itop-entrypoint"]
+CMD ["apache2-foreground"]
+
+ENV DB_HOSTNAME="db" DB_PREFIX=""
+VOLUME ["/var/www/html/conf", "/var/www/html/data", "/var/www/html/env-production", "/var/www/html/log"]

3.1/Makefile

@@ -0,0 +1,38 @@
+version = 3.1.2
+release = $(version)
+patch = 14913
+builder = itop_builder
+platforms = linux/arm64,linux/amd64
+
+all: setup_builder load
+
+setup_builder:
+	docker buildx inspect $(builder) > /dev/null || docker buildx create --name $(builder) --driver docker-container --platform $(platforms) --bootstrap
+
+build: setup_builder
+	# Build all supported platforms
+	docker buildx build --pull \
+		--builder $(builder) \
+		--platform $(platforms) \
+		--build-arg release=$(release) \
+		--build-arg patch=$(patch) .
+
+load: setup_builder
+	# Build and load current platform
+	docker buildx build --pull --load \
+		--builder $(builder) \
+		--build-arg release=$(release) \
+		--build-arg patch=$(patch) \
+		-t supervisions/itop:3.1 \
+		-t supervisions/itop:$(version) \
+		-t supervisions/itop:$(release) .
+
+push: setup_builder
+	# Build and push all supported platforms
+	docker buildx build --pull --push \
+		--builder $(builder) \
+		--platform $(platforms) \
+		--build-arg release=$(release) \
+		--build-arg patch=$(patch) \
+		-t supervisions/itop:3.1 \
+		-t supervisions/itop:$(version) .

3.1/config-itop.php

@@ -0,0 +1,12 @@
+<?php
+
+$MySettings = array(
+	'db_host'    => $_ENV['DB_HOSTNAME'],
+	'db_name'    => $_ENV['DB_ENV_MYSQL_DATABASE'],
+	'db_user'    => $_ENV['DB_ENV_MYSQL_USER'],
+	'db_pwd'     => $_ENV['DB_ENV_MYSQL_PASSWORD'],
+	'db_subname' => $_ENV['DB_PREFIX'],
+);
+
+$MyModuleSettings = array();
+$MyModules = array('addons' => array());

3.1/docker-itop-entrypoint

@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+# show iTop log messages in docker logs
+tail --pid 1 -n0 -F log/setup.log log/error.log log/deadlocks.log log/deprecated-calls.log log/tools.log > /dev/stderr &
+
+exec "$@"

3.1/php.ini

@@ -0,0 +1,12 @@
+[Core]
+; iTop recommended value
+memory_limit = 256M
+; iTop security best practice
+zend.exception_ignore_args = true
+
+[Session]
+; iTop wants save_path to be set
+session.save_path = "/tmp"
+; iTop security best practices
+session.cookie_httponly = true
+session.cookie_samesite = "Lax"