diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d36b93265cb3d97811717f5120af414a2fab81e3..12a493edae252b697079ee4d4e42794ba519c362 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,9 @@ stages: script: - cd Docker/php-8.1 - sh ./build.sh + - cd .. + - cd Docker/php-8.2 + - sh ./build.sh build: <<: *build-template diff --git a/Docker/php-8.2/Dockerfile b/Docker/php-8.2/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..d324312287caf70b33fd1337d4fcb7a0d1284d44 --- /dev/null +++ b/Docker/php-8.2/Dockerfile @@ -0,0 +1,7 @@ +FROM php:8.2-cli + +RUN apt-get update && apt-get install -y git libzip-dev zip libicu-dev && docker-php-ext-install zip && docker-php-ext-install bcmath && docker-php-ext-configure intl && docker-php-ext-install intl \ + && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ + && php composer-setup.php --install-dir=/usr/local/bin --filename=composer + + diff --git a/Docker/php-8.2/build.sh b/Docker/php-8.2/build.sh new file mode 100644 index 0000000000000000000000000000000000000000..9e3dd4896906125e5113f1bd7c4fb738de6dcef0 --- /dev/null +++ b/Docker/php-8.2/build.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +TAG=1 + +docker build -t $IMAGE_TAG/php-8.2:$TAG . +docker push $IMAGE_TAG/php-8.2:$TAG \ No newline at end of file diff --git a/gitlab-ci.yml b/gitlab-ci.yml index ca0543640aa0110f23caa03842d59720ca2dc09b..184c520aa7e2ac65b492ad13e8509750df06e705 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -36,7 +36,7 @@ stages: - npm config set -- //${CI_SERVER_HOST}/:_authToken=${PREDATORS_DEPLOY_TOKEN} - npm config set @octolize:registry=https://${CI_SERVER_HOST}/api/v4/packages/npm/ - npm config list - - npm install + - npm ci - npm run build .template: &deploy-template @@ -55,7 +55,7 @@ stages: - ls -al - ssh-keyscan -H -p 222 $DEPLOY_HOST >> ~/.ssh/known_hosts - rsync -v --delete -rlDe 'ssh -p 222 -v -i ~/.ssh/id_rsa_demo_fs' --exclude-from=.distignore ${CI_PROJECT_DIR}/web/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR - - ssh -p 222 -i ~/.ssh/id_rsa_demo_fs $DEPLOY_USER@$DEPLOY_HOST "cd $DEPLOY_DIR && mv frontend/dist/assets/ public/ && mv frontend/dist/index.html public/index.html && php81 bin/console doctrine:migrations:migrate --no-interaction && php81 bin/console cache:clear && $RUN_AFTER_DEPLOY" + - ssh -p 222 -i ~/.ssh/id_rsa_demo_fs $DEPLOY_USER@$DEPLOY_HOST "cd $DEPLOY_DIR && mv frontend/dist/assets/ public/ && mv frontend/dist/index.html public/index.html && php82 bin/console doctrine:migrations:migrate --no-interaction && php82 bin/console cache:clear && $RUN_AFTER_DEPLOY" after_script: - $DEPLOY_AFTER_SCRIPT @@ -84,7 +84,7 @@ composer install: name: "vendor" paths: - web/vendor - image: gitlab.wpdesk.dev:5050/wpdesk/predators/shopify/tools/gitlab-ci/php-8.1:1 + image: gitlab.wpdesk.dev:5050/wpdesk/predators/shopify/tools/gitlab-ci/php-8.2:1 tags: - vendor stage: build