From 786e61077582bc9fbc43c1da38b826719d26bf93 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 26 Nov 2020 12:46:27 +0100
Subject: [PATCH] Switch to the core-bundle docker image for CI
No need to duplicate this everywhere
---
.gitlab-ci.yml | 29 ++++++++++++++--
.gitlab-ci/Dockerfile | 57 --------------------------------
.gitlab-ci/README.md | 4 ---
.gitlab-ci/build.sh | 9 -----
.gitlab-ci/php-ini-overrides.ini | 1 -
5 files changed, 26 insertions(+), 74 deletions(-)
delete mode 100644 .gitlab-ci/Dockerfile
delete mode 100644 .gitlab-ci/README.md
delete mode 100755 .gitlab-ci/build.sh
delete mode 100644 .gitlab-ci/php-ini-overrides.ini
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f34e91..5372a89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.tugraz.at/dbp/middleware/dbp-api/api-server-template:v1
+image: registry.gitlab.tugraz.at/dbp/middleware/dbp-api/api-core-bundle/main:v1
before_script:
- 'git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.tugraz.at/".insteadOf "git@gitlab.tugraz.at:"'
@@ -32,10 +32,33 @@ test-php7.4:
PHP: "php7.4"
<<: *test_defaults
-lint:
+test-php8.0:
+ allow_failure: true
+ stage: test
+ variables:
+ PHP: "php8.0"
+ <<: *test_defaults
+
+psalm:
+ stage: test
+ allow_failure: true
+ script:
+ - sudo update-alternatives --set php /usr/bin/php7.3
+ - composer install
+ - composer run psalm
+
+phpstan:
+ stage: test
+ allow_failure: true
+ script:
+ - sudo update-alternatives --set php /usr/bin/php7.3
+ - composer install
+ - composer run phpstan
+
+cs-fixer:
stage: test
allow_failure: true
script:
- sudo update-alternatives --set php /usr/bin/php7.3
- composer install
- - composer run lint
\ No newline at end of file
+ - composer run cs
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
deleted file mode 100644
index 4e099f8..0000000
--- a/.gitlab-ci/Dockerfile
+++ /dev/null
@@ -1,57 +0,0 @@
-FROM debian:buster
-
-ENV LANG C.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-
-# Basics
-RUN apt-get update && apt-get install -y \
- composer \
- php-zip \
- sudo \
- wget \
- curl \
- lsb-release \
- && rm -rf /var/lib/apt/lists/*
-
-# PHP Repo
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
-
-# PHP 7.3
-RUN apt-get update && apt-get install -y \
- php7.3 \
- php7.3-curl \
- php7.3-soap \
- php7.3-xml \
- php7.3-ldap \
- php7.3-zip \
- php7.3-gmp \
- php7.3-xdebug \
- php7.3-mbstring \
- && rm -rf /var/lib/apt/lists/*
-COPY ./php-ini-overrides.ini /etc/php/7.3/cli/conf.d/
-
-# PHP 7.4
-RUN apt-get update && apt-get install -y \
- php7.4 \
- php7.4-curl \
- php7.4-soap \
- php7.4-xml \
- php7.4-ldap \
- php7.4-zip \
- php7.4-gmp \
- php7.4-xdebug \
- php7.4-mbstring \
- && rm -rf /var/lib/apt/lists/*
-COPY ./php-ini-overrides.ini /etc/php/7.4/cli/conf.d/
-
-# Default to PHP 7.3
-RUN sudo update-alternatives --set php /usr/bin/php7.3
-RUN sudo update-alternatives --set phar /usr/bin/phar7.3
-RUN sudo update-alternatives --set phar.phar /usr/bin/phar.phar7.3
-
-# Add a normal user and enable sudo
-RUN useradd -u 1000 -ms /bin/bash user
-RUN echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-USER user
-WORKDIR /home/user
\ No newline at end of file
diff --git a/.gitlab-ci/README.md b/.gitlab-ci/README.md
deleted file mode 100644
index 8d8563a..0000000
--- a/.gitlab-ci/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-* In case of an incompatible change increase the tag version number in build.sh
-* ./build.sh
-* (first time) sudo docker login registry.gitlab.tugraz.at
-* sudo docker push registry.gitlab.tugraz.at/dbp/middleware/dbp-api/api-server-template:v1
\ No newline at end of file
diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
deleted file mode 100755
index bdc8b74..0000000
--- a/.gitlab-ci/build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-TAG="registry.gitlab.tugraz.at/dbp/middleware/dbp-api/api-server-template:v1"
-docker build --tag "${TAG}" --file "Dockerfile" .
-docker run --rm --security-opt label=disable \
- --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
- --tty --interactive "${TAG}" bash
-echo "Now run: sudo docker push '$TAG'"
\ No newline at end of file
diff --git a/.gitlab-ci/php-ini-overrides.ini b/.gitlab-ci/php-ini-overrides.ini
deleted file mode 100644
index 23c8e40..0000000
--- a/.gitlab-ci/php-ini-overrides.ini
+++ /dev/null
@@ -1 +0,0 @@
-zend.assertions = 1
--
GitLab