Merge pull request #25 from itsmng/fix_for_kubernetes

Fix for kubernetes

.github/workflows/build.yml

@@ -40,5 +40,25 @@ jobs:
             ghcr.io/itsmng/itsm-ng:latest
             docker.io/itsmng/itsm-ng:${{ github.ref_name }}
             docker.io/itsmng/itsm-ng:latest
+          build-args: |
+            VERSION=${{ github.ref_name }}
           context: latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          platforms: linux/amd64,linux/arm64
+
+
+
+      - name: Build and push cron image
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: |
+            ghcr.io/itsmng/itsm-ng:${{ github.ref_name }}-cron
+            ghcr.io/itsmng/itsm-ng:latest-cron
+          build-args: |
+            VERSION=${{ github.ref_name }}
+          context: cron
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           platforms: linux/amd64,linux/arm64

cron/Dockerfile

@@ -0,0 +1,17 @@
+FROM ghcr.io/itsmng/itsm-ng:latest-cron
+
+ARG REPO="itsmng"
+ARG VERSION
+
+RUN 	apt update &&\
+	apt install wget -y && \
+	cd /var/www && \
+        wget -q "https://github.com/$REPO/itsm-ng/releases/download/v$VERSION/itsm-ng-v$VERSION.tgz" && \
+        tar -xf itsm-ng-v${VERSION}.tgz && \
+        rm -rf itsm-ng-v${VERSION}.tgz
+
+COPY ./docker-entrypoint.sh /docker-entrypoint.sh
+COPY ./docker-entrypoint.d /docker-entrypoint.d
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD exit

cron/docker-entrypoint.d/10-check_bdd.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Wait for MySQL to be ready
+until nc -z -v -w30 $MARIADB_HOST 3306; do
+        echo "Waiting for MySQL connection..."
+        sleep 2
+done

cron/docker-entrypoint.d/20-cron.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /var/www/itsm-ng/front/cron.php

cron/docker-entrypoint.d/30-ocsinventory.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -f /var/www/itsm-ng/plugins/ocsinventoryng/scripts/run.php ]; then
+	php /var/www/itsm-ng/plugins/ocsinventoryng/scripts/run.php
+fi

latest/Dockerfile

@@ -1,10 +1,10 @@
 FROM debian:bookworm-slim
 
 ARG REPO="itsmng"
-ARG VERSION=2.0.2
+ARG VERSION
 
 RUN apt update && apt dist-upgrade -y && \
-        apt install -y apache2 wget php php-fpm php-mysql php-intl php-mbstring php-gd php-ldap php-simplexml php-curl php-apcu php-xmlrpc && \
+        apt install -y apache2 wget php php-fpm php-mysql php-intl php-mbstring php-gd php-ldap php-simplexml php-curl php-apcu php-xmlrpc netcat-traditional && \
         a2enmod proxy_fcgi setenvif && \
         a2enconf php8.2-fpm && \
         apt-get -y clean && \

latest/docker-entrypoint.d/10-fix-files.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if [ ! -d /var/www/itsm-ng/files/_cache ]; then
+        mkdir -pv /var/www/itsm-ng/files/_cache 	\
+		/var/www/itsm-ng/files/_cron 		\
+		/var/www/itsm-ng/files/_dumps 		\
+		/var/www/itsm-ng/files/_graphs 		\
+		/var/www/itsm-ng/files/_lock 		\
+		/var/www/itsm-ng/files/_pictures 	\
+		/var/www/itsm-ng/files/_plugins 	\
+		/var/www/itsm-ng/files/_rss 		\
+		/var/www/itsm-ng/files/_sessions 	\
+		/var/www/itsm-ng/files/_tmp 		\
+		/var/www/itsm-ng/files/_uploads
+
+	chown -R www-data:www-data /var/www/itsm-ng/files
+fi
+

latest/docker-entrypoint.d/20-install.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Wait for MySQL to be ready
+until nc -z -v -w30 $MARIADB_HOST 3306; do
+	echo "Waiting for MySQL connection..."
+	sleep 2
+done
+
+# Run the installation if config_db.php doesn't exist
+if [ ! -f /var/www/itsm-ng/config/config_db.php ]; then
+	chmod -R 777 /var/www/itsm-ng/files/_sessions
+	cd /var/www/itsm-ng && php bin/console itsmng:database:install -H $MARIADB_HOST -u $MARIADB_USER -p $MARIADB_PASSWORD -d $MARIADB_DATABASE -n
+fi

latest/docker-entrypoint.d/30-update.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Wait for MySQL to be ready
+until nc -z -v -w30 $MARIADB_HOST 3306; do
+	echo "Waiting for MySQL connection..."
+	sleep 2
+done
+
+# Run the update if config_db.php exist
+if [ -f /var/www/itsm-ng/config/config_db.php ]; then
+	cd /var/www/itsm-ng && php bin/console itsmng:database:update -n
+fi

latest/docker-entrypoint.d/40-fix-permission.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -f /var/www/itsm-ng/config/config_db.php ]; then
+	chown -R www-data:www-data /var/www/itsm-ng/files
+fi