Merge branch 'develop' into 'main'

Merging develop into main

See merge request !41

.gitlab-ci.yml

@@ -5,7 +5,7 @@ include:
 
 variables:
   VERSION: ${CI_COMMIT_TAG}
-  CI_VERSION: v2.2.17
+  CI_VERSION: v2.2.18
 
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
@@ -34,7 +34,7 @@ php:
   stage: build
   parallel:
     matrix:
-      - PHP: ['7.4','8.0','8.1','8.2']
+      - PHP: ['7.4','8.0','8.1','8.2','8.3']
   script:
     - docker build --pull --build-arg PHP_VERSION=${PHP} --build-arg VERSION=${VERSION} --build-arg CI_VERSION=${CI_VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
     - docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION}

run/Dockerfile

@@ -9,8 +9,8 @@ LABEL com.example.vendor="LakeDrops" \
 
 USER root
 
-ARG compose_version=1.29.2
-ARG glibc_version=2.28-r0
+ARG compose_version=2.24.5
+ARG glibc_version=2.35-r1
 
 ADD scripts/* /usr/local/bin/
 
@@ -24,7 +24,7 @@ RUN apk add --no-cache bash curl jq yq && \
     ln -s /usr/lib/libgcc_s.so.1 /lib/libgcc_s.so.1 && \
     ln -s /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
     mkdir -p /usr/local/lib/docker/cli-plugins && \
-    curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && \
+    curl -SL https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && \
     chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
     sed -i -e "s/'{{ version }}'/${VERSION}/g" /usr/local/bin/run
 

run/scripts/reset

@@ -21,6 +21,8 @@ export PHP_VERSION=8.1
 /usr/local/bin/update
 export PHP_VERSION=8.2
 /usr/local/bin/update
+export PHP_VERSION=8.3
+/usr/local/bin/update
 
 echo "Cleaning old container"
 docker kill l3drun >/dev/null

run/scripts/start

@@ -14,8 +14,8 @@ function getConfig() {
   fi
   if [[ ! -n ${PHP_VERSION} ]]; then
     while true; do
-      DEFAULT=8.1
-      read -p "Which PHP version is your project using [7.4, 8.0, 8.1, 8.2]? " VALUE
+      DEFAULT=8.2
+      read -p "Which PHP version is your project using [7.4, 8.0, 8.1, 8.2*, 8.3]? *) Default" VALUE
       if [[ "x$VALUE" == "x" ]]; then
         PHP_VERSION=$DEFAULT
       else
@@ -30,6 +30,7 @@ function getConfig() {
       8.0) break ;;
       8.1) break ;;
       8.2) break ;;
+      8.3) break ;;
       *) echo "Version not supported." ;;
       esac
     done