diff --git a/kustomization/base/tekton/pipeline/pipeline-symfonyapp.yaml b/kustomization/base/tekton/pipeline/pipeline-symfonyapp.yaml index d44e3fe..23fc169 100644 --- a/kustomization/base/tekton/pipeline/pipeline-symfonyapp.yaml +++ b/kustomization/base/tekton/pipeline/pipeline-symfonyapp.yaml @@ -15,12 +15,14 @@ spec: - name: destination type: string description: The git repo branch to merge to. - - name: image - type: string - description: Full name of image repo. - - name: dockerfile - type: string - description: 'The path to the Dockerfile to execute (default: ./Dockerfile)' + # - name: image + # type: string + # description: Full name of image repo. + # - name: dockerfile + # type: string + # description: 'The path to the Dockerfile to execute (default: ./Dockerfile)' + + workspaces: - name: shared-data description: | @@ -28,8 +30,10 @@ spec: next task. - name: config - name: docker-credentials + + tasks: - # Clone du repo git + # 📥 Clone du repo git - name: fetch-source taskRef: name: git-clone @@ -46,7 +50,7 @@ spec: - name: depth value: '50' - # Lecture du readme du projet + # ⭐ Lecture du readme du projet - name: show-readme runAfter: ["fetch-source"] taskRef: @@ -54,7 +58,8 @@ spec: workspaces: - name: source workspace: shared-data - # Execution des tests php-security-check + + # ⭐ Execution des tests php-security-check - name: php-security-check runAfter: ["fetch-source"] taskRef: @@ -62,7 +67,8 @@ spec: workspaces: - name: source workspace: shared-data - # Execution des tests phpstan + + # ⭐ Execution des tests phpstan - name: phpstan runAfter: ["fetch-source"] taskRef: @@ -70,7 +76,8 @@ spec: workspaces: - name: source workspace: shared-data - # Execution des tests php-cs-fixer + + # ⭐ Execution des tests php-cs-fixer - name: php-cs-fixer runAfter: ["fetch-source"] taskRef: @@ -84,7 +91,7 @@ spec: - name: destination value: $(params.destination) - # Execution des tests unitaires avec une BDD en sidecar + # ⭐ Execution des tests unitaires avec une BDD en sidecar - name: php-unit-test runAfter: - fetch-source @@ -97,6 +104,7 @@ spec: - name: source workspace: shared-data + ## 🔨 Build de l'image # - name: kaniko-build # taskRef: # name: kaniko @@ -118,10 +126,7 @@ spec: # - name: dockerconfig # workspace: docker-credentials # runAfter: - # - fetch-source - # # - php-cs-fixer - # # - phpstan - # # - php-security-check + # - php-unit-test # retries: 3 diff --git a/kustomization/base/tekton/pipeline/pipelinerun.yaml b/kustomization/base/tekton/pipeline/pipelinerun.yaml index 37ebff3..6c36ab6 100644 --- a/kustomization/base/tekton/pipeline/pipelinerun.yaml +++ b/kustomization/base/tekton/pipeline/pipelinerun.yaml @@ -32,7 +32,7 @@ spec: value: issue-2977 - name: destination value: sprint-8 - - name: image - value: reg.cadoles.com/mlamalle/testtekton - - name: dockerfile - value: misc/docker/Dockerfile + # - name: image + # value: reg.cadoles.com/mlamalle/testtekton + # - name: dockerfile + # value: misc/docker/Dockerfile diff --git a/resources/com/cadoles/symfony/.php-cs-fixer.dist.php b/resources/com/cadoles/symfony/.php-cs-fixer.dist.php deleted file mode 100644 index acdd383..0000000 --- a/resources/com/cadoles/symfony/.php-cs-fixer.dist.php +++ /dev/null @@ -1,41 +0,0 @@ -in(__DIR__.'/src') - ->name('*.php') -; - -return (new PhpCsFixer\Config()) - ->setRules([ - '@Symfony' => true, - 'concat_space' => ['spacing' => 'none'], - 'array_syntax' => ['syntax' => 'short'], - 'combine_consecutive_issets' => true, - 'explicit_indirect_variable' => true, - 'no_useless_return' => true, - 'ordered_imports' => true, - 'no_unused_imports' => true, - 'no_spaces_after_function_name' => true, - 'no_spaces_inside_parenthesis' => true, - 'ternary_operator_spaces' => true, - 'class_definition' => ['single_line' => true], - 'whitespace_after_comma_in_array' => true, - 'phpdoc_add_missing_param_annotation' => ['only_untyped' => true], - 'phpdoc_order' => true, - 'phpdoc_types_order' => [ - 'null_adjustment' => 'always_last', - 'sort_algorithm' => 'alpha', - ], - 'phpdoc_no_empty_return' => false, - 'phpdoc_summary' => false, - 'general_phpdoc_annotation_remove' => [ - 'annotations' => [ - 'expectedExceptionMessageRegExp', - 'expectedException', - 'expectedExceptionMessage', - 'author', - ], - ], - ]) - ->setFinder($finder) -; diff --git a/resources/com/cadoles/symfony/Dockerfile b/resources/com/cadoles/symfony/Dockerfile deleted file mode 100644 index e45e32b..0000000 --- a/resources/com/cadoles/symfony/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -ARG PHP_SECURITY_CHECKER_VERSION=1.0.0 -ARG JQ_VERSION=1.6 - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - wget tar curl ca-certificates \ - openssl bash git unzip \ - php-cli php-dom php-mbstring php-ctype php-xml php-iconv - -COPY add-letsencrypt-ca.sh /root/add-letsencrypt-ca.sh - -RUN bash /root/add-letsencrypt-ca.sh \ - && rm -f /root/add-letsencrypt-ca.sh - -RUN wget -O /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 \ - && chmod +x /usr/local/bin/jq - -# Install local-php-security-checker -RUN wget -O /usr/local/bin/local-php-security-checker https://github.com/fabpot/local-php-security-checker/releases/download/v${PHP_SECURITY_CHECKER_VERSION}/local-php-security-checker_${PHP_SECURITY_CHECKER_VERSION}_linux_amd64 \ - && chmod +x /usr/local/bin/local-php-security-checker - -# Install junit2md -RUN junit2md_download_url=$(curl "https://forge.cadoles.com/api/v1/repos/Cadoles/junit2md/releases" -H "accept:application/json" | jq -r 'sort_by(.published_at) | reverse | .[0] | .assets[] | select(.name == "junit2md-linux-amd64.tar.gz") | .browser_download_url') \ - && wget -O junit2md-linux-amd64.tar.gz "$junit2md_download_url" \ - && tar -xzf junit2md-linux-amd64.tar.gz \ - && cp junit2md-linux-amd64/junit2md /usr/local/bin/junit2md - -# Install composer -RUN wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --force --install-dir /usr/local/bin --filename composer \ - && chmod +x /usr/local/bin/composer - -# Install php-cs-fixer -RUN mkdir --parents /tools/php-cs-fixer \ - && composer require --working-dir=/tools/php-cs-fixer friendsofphp/php-cs-fixer \ - && ln -s /tools/php-cs-fixer/vendor/bin/php-cs-fixer /usr/local/bin/php-cs-fixer - -# Install php-stan -RUN mkdir --parents /tools/phpstan \ - && composer require --working-dir=/tools/phpstan phpstan/phpstan \ - && ln -s /tools/phpstan/vendor/bin/phpstan /usr/local/bin/phpstan \ - && composer require --working-dir=/tools/phpstan phpstan/phpstan-symfony \ - && composer require --working-dir=/tools/phpstan phpstan/phpstan-doctrine - -# Install Symfony -RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | bash \ - && apt update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y symfony-cli \ No newline at end of file diff --git a/resources/com/cadoles/symfony/phpstan.neon b/resources/com/cadoles/symfony/phpstan.neon deleted file mode 100644 index b58a9bc..0000000 --- a/resources/com/cadoles/symfony/phpstan.neon +++ /dev/null @@ -1,4 +0,0 @@ -includes: - - /tools/phpstan/vendor/phpstan/phpstan-symfony/extension.neon - - /tools/phpstan/vendor/phpstan/phpstan-doctrine/extension.neon - - /tools/phpstan/vendor/phpstan/phpstan-doctrine/rules.neon \ No newline at end of file diff --git a/symfony/.php-cs-fixer.dist.php b/symfony/.php-cs-fixer.dist.php deleted file mode 100644 index acdd383..0000000 --- a/symfony/.php-cs-fixer.dist.php +++ /dev/null @@ -1,41 +0,0 @@ -in(__DIR__.'/src') - ->name('*.php') -; - -return (new PhpCsFixer\Config()) - ->setRules([ - '@Symfony' => true, - 'concat_space' => ['spacing' => 'none'], - 'array_syntax' => ['syntax' => 'short'], - 'combine_consecutive_issets' => true, - 'explicit_indirect_variable' => true, - 'no_useless_return' => true, - 'ordered_imports' => true, - 'no_unused_imports' => true, - 'no_spaces_after_function_name' => true, - 'no_spaces_inside_parenthesis' => true, - 'ternary_operator_spaces' => true, - 'class_definition' => ['single_line' => true], - 'whitespace_after_comma_in_array' => true, - 'phpdoc_add_missing_param_annotation' => ['only_untyped' => true], - 'phpdoc_order' => true, - 'phpdoc_types_order' => [ - 'null_adjustment' => 'always_last', - 'sort_algorithm' => 'alpha', - ], - 'phpdoc_no_empty_return' => false, - 'phpdoc_summary' => false, - 'general_phpdoc_annotation_remove' => [ - 'annotations' => [ - 'expectedExceptionMessageRegExp', - 'expectedException', - 'expectedExceptionMessage', - 'author', - ], - ], - ]) - ->setFinder($finder) -; diff --git a/symfony/Dockerfile b/symfony/Dockerfile deleted file mode 100644 index e45e32b..0000000 --- a/symfony/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -ARG PHP_SECURITY_CHECKER_VERSION=1.0.0 -ARG JQ_VERSION=1.6 - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - wget tar curl ca-certificates \ - openssl bash git unzip \ - php-cli php-dom php-mbstring php-ctype php-xml php-iconv - -COPY add-letsencrypt-ca.sh /root/add-letsencrypt-ca.sh - -RUN bash /root/add-letsencrypt-ca.sh \ - && rm -f /root/add-letsencrypt-ca.sh - -RUN wget -O /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 \ - && chmod +x /usr/local/bin/jq - -# Install local-php-security-checker -RUN wget -O /usr/local/bin/local-php-security-checker https://github.com/fabpot/local-php-security-checker/releases/download/v${PHP_SECURITY_CHECKER_VERSION}/local-php-security-checker_${PHP_SECURITY_CHECKER_VERSION}_linux_amd64 \ - && chmod +x /usr/local/bin/local-php-security-checker - -# Install junit2md -RUN junit2md_download_url=$(curl "https://forge.cadoles.com/api/v1/repos/Cadoles/junit2md/releases" -H "accept:application/json" | jq -r 'sort_by(.published_at) | reverse | .[0] | .assets[] | select(.name == "junit2md-linux-amd64.tar.gz") | .browser_download_url') \ - && wget -O junit2md-linux-amd64.tar.gz "$junit2md_download_url" \ - && tar -xzf junit2md-linux-amd64.tar.gz \ - && cp junit2md-linux-amd64/junit2md /usr/local/bin/junit2md - -# Install composer -RUN wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --force --install-dir /usr/local/bin --filename composer \ - && chmod +x /usr/local/bin/composer - -# Install php-cs-fixer -RUN mkdir --parents /tools/php-cs-fixer \ - && composer require --working-dir=/tools/php-cs-fixer friendsofphp/php-cs-fixer \ - && ln -s /tools/php-cs-fixer/vendor/bin/php-cs-fixer /usr/local/bin/php-cs-fixer - -# Install php-stan -RUN mkdir --parents /tools/phpstan \ - && composer require --working-dir=/tools/phpstan phpstan/phpstan \ - && ln -s /tools/phpstan/vendor/bin/phpstan /usr/local/bin/phpstan \ - && composer require --working-dir=/tools/phpstan phpstan/phpstan-symfony \ - && composer require --working-dir=/tools/phpstan phpstan/phpstan-doctrine - -# Install Symfony -RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | bash \ - && apt update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y symfony-cli \ No newline at end of file diff --git a/symfony/phpstan.neon b/symfony/phpstan.neon deleted file mode 100644 index b58a9bc..0000000 --- a/symfony/phpstan.neon +++ /dev/null @@ -1,4 +0,0 @@ -includes: - - /tools/phpstan/vendor/phpstan/phpstan-symfony/extension.neon - - /tools/phpstan/vendor/phpstan/phpstan-doctrine/extension.neon - - /tools/phpstan/vendor/phpstan/phpstan-doctrine/rules.neon \ No newline at end of file