Commit 19f14bbd authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch 'develop' into 'main' 

Merge develop into master

Closes #25

See merge request !28
parents 97e6b592 176e749b

.gitlab-ci.yml

+46 −71
Original line number Diff line number Diff line 
variables:

  WORDPRESS_VERSION:

    value: 5.8.1

    value: 6.0.3

    description: WordPress release

  PHP_VERSION:

    value: 8.0.0

    value: 8.1.11

    description: PHP release to build into the backend image

  NGINX_VERSION:

    value: 1.21.3

    value: 1.23.2

    description: Nginx release for the frontend image





.changes: &change-files

  changes:

  - .gitlab-ci.yml

  - Dockerfile

  - data/*

  - plugins/*

  - scripts/*



.build:

  stage: build

  image: docker.kodo.org.uk/ci-images/buildkit/buildctl:latest

  tags: [buildkit]

workflow:

  rules:

  - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    variables: {BUILD_RELEASE: "true"}

  - if: $CI_PIPELINE_SOURCE == "schedule"

  - if: $CI_PIPELINE_SOURCE == "merge_request_event"

  - << : *change-files

  script:

  - BUILD_TAG=${CI_REGISTRY_IMAGE}/${TARGET}:build-${CI_PIPELINE_IID}

  - buildctl build

    --frontend=dockerfile.v0

    --local context=.

    --local dockerfile=.

    --opt target=${TARGET}

    --opt build-arg:nginx_version=${NGINX_VERSION}

    --opt build-arg:php_version=${PHP_VERSION}

    --opt build-arg:wp_version=${WORDPRESS_VERSION}

    --opt label:nginx.version=${NGINX_VERSION}

    --opt label:php.version=${PHP_VERSION}

    --opt label:wordpress.version=${WORDPRESS_VERSION}

    --output type=image,name=${BUILD_TAG},push=true

    variables: {BUILD_RELEASE: "true"}

  - when: always





.tag:

  stage: deploy

  image: docker.kodo.org.uk/ci-images/docker-reg:latest

  rules:

  - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule"

    variables:

      TAG: latest

  - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    << : *change-files

    variables:

      TAG: latest

  - if: $CI_COMMIT_BRANCH == "develop"

    << : *change-files

    variables:

      TAG: unstable

  script: |

    BUILD_TAG=${CI_REGISTRY_IMAGE}/${TARGET}:build-${CI_PIPELINE_IID}

    docker-reg $BUILD_TAG retag $TAG

    if [ $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ]; then

      docker-reg $BUILD_TAG retag $VERSION

    fi



include:

- project: dom/project-templates

  file: /pipeline-templates/pre-commit.yml



Build Wordpress:

  extends: [.build]

  variables:

    TARGET: fastcgi



Build Nginx:

  extends: [.build]

Build Images:

  stage: build

  rules:

  - if: $BUILD_RELEASE

    when: never

  - if: $CI_PIPELINE_SOURCE == "web"

  - changes:

    - .gitlab-ci.yml

    - Dockerfile

    - data/*

    - plugins/*

    - scripts/*

  variables:

    TARGET: nginx



    PLATFORMS: ""

    BUILD_ARGS: >-

      wp_version=$WORDPRESS_VERSION

      php_version=$PHP_VERSION

      nginx_version=$NGINX_VERSION

  parallel:

    matrix:

    - TARGET: [nginx, fastcgi]

  trigger:

    include:

    - project: dom/project-templates

      file: /pipeline-templates/build-image.yml

    strategy: depend



Tag Wordpress Image:

  extends: [.tag]

  variables:

    TARGET: fastcgi

    VERSION: $WORDPRESS_VERSION



Tag Nginx Image:

  extends: [.tag]

  variables:

    TARGET: nginx

    VERSION: $NGINX_VERSION
 
Build Releases:

  stage: build

  extends: [Build Images]

  rules:

  - if: $BUILD_RELEASE

  parallel:

    matrix:

    - TARGET: [nginx]

      RELEASE: [$NGINX_VERSION]

    - TARGET: [fastcgi]

      RELEASE: [$WORDPRESS_VERSION]

.lint.cfg

+1 −3
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ force_single_line = true 
strict = true

warn_unused_configs = true

warn_unreachable = true

mypy_path = tests, tests/stubs

plugins =

  trio_typing.plugin

mypy_path = tests



[flake8]

max-line-length = 92

.pre-commit-config.yaml

+2 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ repos: 
  - id: check-executable-modes

  - id: check-for-squash

  - id: copyright-notice

    exclude: ^data/

    exclude: ^data/|^scripts/(compile-|install-)

  - id: protect-first-parent



- repo: https://github.com/pre-commit/pygrep-hooks
@@ -95,6 +95,5 @@ repos: 
  - id: mypy

    args: ["--config-file=.lint.cfg"]

    additional_dependencies:

    - trio-typing

    - types-requests

    - git+https://code.kodo.org.uk/dom/type-stubs.git#type-stubs[jsonpath,parse]
 
    - behave-utils ~=0.3.2

data/composer.json

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
		"ayesh/wordpress-password-hash": "2.*"

	},

	"config": {

		"allow-plugins": {

			"composer/installers": true

		},

		"gitlab-domains": [ "code.kodo.org.uk" ]

	},

	"extra": {

data/nginx/502.html→data/nginx/html/502.html

+0 −0

File moved.

View file