From a51c9ac83a178cdda6ef2bd9e72c891c5127ac47 Mon Sep 17 00:00:00 2001
From: Sebastian Pisula <sebastian.pisula@gmail.com>
Date: Fri, 22 Dec 2023 23:31:28 +0100
Subject: [PATCH] feature(core): php 8.2
---
.gitlab-ci.yml | 3 +++
Docker/php-8.2/Dockerfile | 7 +++++++
Docker/php-8.2/build.sh | 6 ++++++
gitlab-ci.yml | 6 +++---
4 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 Docker/php-8.2/Dockerfile
create mode 100644 Docker/php-8.2/build.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d36b932..12a493e 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 0000000..d324312
--- /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 0000000..9e3dd48
--- /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 ca05436..184c520 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
--
GitLab