diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index b251e6ddfea64abeb6b9ad0a8e9acc8c6fd156d8..0000000000000000000000000000000000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,42 +0,0 @@ -variables: - DOCKER_DRIVER: overlay2 - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" - -stages: - - build - -.template: &build-template - tags: - - privileged - image: docker:latest - services: - - docker:dind - variables: - IMAGE_TAG: $CI_REGISTRY_IMAGE - stage: build - before_script: - - echo $CI_REGISTRY - - echo $CI_REGISTRY_USER - - echo $CI_REGISTRY_PASSWORD - - echo $CI_REGISTRY_IMAGE - - echo $IMAGE_TAG - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - script: - - cd Docker/php-8.1 - - sh ./build.sh - - cd .. - - ls - - cd Docker/php-8.2 - - sh ./build.sh - -build: - <<: *build-template - only: - - main - -build manual: - <<: *build-template - when: manual - except: - - main diff --git a/Docker/php-8.1/Dockerfile b/Docker/php-8.1/Dockerfile deleted file mode 100644 index bd9fd7c0dfdbe6783ffe81af7828cd7367eff44a..0000000000000000000000000000000000000000 --- a/Docker/php-8.1/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM php:8.1-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.1/build.sh b/Docker/php-8.1/build.sh deleted file mode 100644 index c6b5e4402ab12ad864e429e136b93fe553613737..0000000000000000000000000000000000000000 --- a/Docker/php-8.1/build.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -TAG=1 - -docker build -t $IMAGE_TAG/php-8.1:$TAG . -docker push $IMAGE_TAG/php-8.1:$TAG \ No newline at end of file diff --git a/Docker/php-8.2/Dockerfile b/Docker/php-8.2/Dockerfile deleted file mode 100644 index d324312287caf70b33fd1337d4fcb7a0d1284d44..0000000000000000000000000000000000000000 --- a/Docker/php-8.2/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 9e3dd4896906125e5113f1bd7c4fb738de6dcef0..0000000000000000000000000000000000000000 --- a/Docker/php-8.2/build.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/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 184c520aa7e2ac65b492ad13e8509750df06e705..189c343e7307b8b5b26a2a5e9e26ed8e5604a96b 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -84,12 +84,13 @@ composer install: name: "vendor" paths: - web/vendor - image: gitlab.wpdesk.dev:5050/wpdesk/predators/shopify/tools/gitlab-ci/php-8.2:1 + image: composer:latest tags: - vendor stage: build interruptible: true script: + - php -v - cd web - composer config gitlab-token.gitlab.wpdesk.dev gitlab-ci-token ${CI_JOB_TOKEN} - composer install --optimize-autoloader --no-dev --no-scripts