diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f267ea..9cb40fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,20 +4,26 @@ name: gcr.io/kaniko-project/executor:v1.9.1-debug entrypoint: [""] script: + - export VERSION=$(date +%d%m%y-%H%I%S) - /kaniko/executor --context "${CI_PROJECT_DIR}/${IMAGE_DIR}" --dockerfile "${CI_PROJECT_DIR}/${IMAGE_DIR}/Dockerfile" - --destination "${IMAGE_TAG}" - --destination "${IMAGE_TAG_LATEST}" + --destination "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${VERSION}" + --destination "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest" allow_failure: false docker-build:qa-8.2: extends: .docker-build - before_script: - - export VERSION=$(date +%d%m%y-%H%I%S) variables: IMAGE_DIR: "PHP8.2/QA" - IMAGE_TAG: "${CI_REGISTRY_IMAGE}/ldcweb-qa-8.2:${VERSION}" - IMAGE_TAG_LATEST: "${CI_REGISTRY_IMAGE}/ldcweb-qa-8.2:latest" + IMAGE_NAME: "ldcweb-qa-8.2" rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $BUILD_NAME == "QA-8.2" + +docker-build:dev-8.2: + extends: .docker-build + variables: + IMAGE_DIR: "PHP8.2/DEV" + IMAGE_NAME: "ldcweb-local-8.2" + rules: + - if: $CI_PIPELINE_SOURCE == "schedule" && $BUILD_NAME == "DEV-8.2" diff --git a/PHP8.2/DEV/Dockerfile b/PHP8.2/DEV/Dockerfile index ddd2d9d..cd805ac 100644 --- a/PHP8.2/DEV/Dockerfile +++ b/PHP8.2/DEV/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-apache +FROM php:8.2-apache-bullseye RUN apt-get update -qq && \ apt-get install -qy \ @@ -53,7 +53,7 @@ RUN docker-php-ext-configure ldap RUN docker-php-ext-install exif gd gettext intl mysqli pdo_mysql xsl opcache zip bcmath ldap RUN pecl install imagick-3.6.0 && docker-php-ext-enable imagick -RUN pecl install memcached-3.1.5 && docker-php-ext-enable memcached +RUN pecl install memcached-3.2.0 && docker-php-ext-enable memcached RUN useradd -ms /bin/bash noroot @@ -73,7 +73,14 @@ RUN chsh -s /bin/zsh RUN pecl install xdebug RUN pecl install pcov && docker-php-ext-enable pcov RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - +## NODE +RUN apt-get update -qq && \ + apt-get install -qy \ + ca-certificates curl gnupg \ + && mkdir -p /etc/apt/keyrings \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list +## END NODE RUN apt-get install -y nodejs RUN apt-get install -y mariadb-client ## DEV