Commit b989d897 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch 'develop' into 'master' 

Merge develop into master

Closes #11 and #14

See merge request !17
parents 0a2c514a 08843fd8

.editorconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
root = true



[*]

charset = utf-8

end_of_line = lf

insert_final_newline = true

indent_style = tab



[*.{yml,yaml}]

indent_style = space

indent_size = 2

.gitlint

0 → 100644
+7 −0
Original line number Diff line number Diff line 
[general]

ignore=body-trailing-whitespace,body-is-missing



[author-valid-email]

regex=.*@[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](\.[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9])+



# vim:ft=cfg

.pre-commit-config.yaml

0 → 100644
+47 −0
Original line number Diff line number Diff line 
repos:



- repo: meta

  hooks:

  - id: check-hooks-apply



- repo: https://github.com/pre-commit/pre-commit-hooks

  rev: v3.4.0

  hooks:

  - id: check-added-large-files

    stages: [commit]

  - id: check-case-conflict

    stages: [commit]

  - id: check-merge-conflict

    stages: [commit]

  - id: check-yaml

    args: [--allow-multiple-documents]

    stages: [commit]

  - id: destroyed-symlinks

    stages: [commit]

  - id: end-of-file-fixer

    stages: [commit]

  - id: fix-byte-order-marker

    stages: [commit]

  - id: mixed-line-ending

    args: [--fix=lf]

    stages: [commit]

  - id: trailing-whitespace

    exclude_types: [markdown, plain-text]

    stages: [commit]



- repo: https://github.com/jorisroovers/gitlint

  rev: v0.15.0

  hooks:

  - id: gitlint



- repo: https://github.com/jumanjihouse/pre-commit-hooks

  rev: 2.1.5

  hooks:

  - id: protect-first-parent



- repo: https://code.kodo.org.uk/dom/pre-commit-hooks

  rev: v0.5.1

  hooks:

  - id: check-for-squash

  - id: copyright-notice

    exclude: ^data/

Dockerfile

+1 −4
Original line number Diff line number Diff line
@@ -5,10 +5,7 @@ ARG php_version 


FROM nginx:${nginx_version:-latest} as nginx

LABEL uk.org.kodo.maintainer = "Dom Sekotill <dom.sekotill@kodo.org.uk>"

COPY data/nginx.conf /etc/nginx/conf.d/default.conf

COPY data/fastcgi.nginx.conf /etc/nginx/fastcgi.conf

COPY data/cache-bust.nginx.conf /etc/nginx/cache-bust.conf

COPY data/5*.html /app/html/

COPY data/nginx /etc/nginx





FROM php:${php_version:+$php_version-}fpm-alpine as deps

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

+0 −0

File moved.

View file