Compare commits

..

No commits in common. "main" and "v1.2.16-2" have entirely different histories.

11 changed files with 60 additions and 81 deletions

View File

@ -1,23 +0,0 @@
# Changelog
{{ range .Versions -}}
## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} ({{ datetime "2006-01-02" .Tag.Date }})
{{ range .CommitGroups -}}
### {{ .Title }}
{{ range .Commits -}}
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
{{ end }}
{{ end -}}
{{- if .NoteGroups -}}
{{ range .NoteGroups -}}
### {{ .Title }}
{{ range .Notes }}
{{ .Body }}
{{ end }}
{{ end -}}
{{ end -}}
{{ end -}}

View File

@ -1,25 +0,0 @@
style: github
template: CHANGELOG.tpl.md
info:
title: CHANGELOG
repository_url: https://gitea.rknet.org/docker/kanboard
options:
commit_groups:
title_maps:
feat: Features
fix: Bug Fixes
perf: Performance Improvements
refactor: Code Refactoring
chore: Others
test: Testing
ci: CI Pipeline
docs: Documentation
header:
pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
pattern_maps:
- Type
- Scope
- Subject
notes:
keywords:
- BREAKING CHANGE

View File

@ -14,7 +14,7 @@ steps:
trigger: trigger:
ref: ref:
- refs/heads/main - refs/heads/master
- refs/pull/** - refs/pull/**
- refs/tags/** - refs/tags/**
@ -28,7 +28,7 @@ platform:
steps: steps:
- name: dryrun - name: dryrun
image: thegeeklab/drone-docker-buildx:20 image: plugins/docker:19
settings: settings:
build_args: build_args:
- BUILD_VERSION=${DRONE_TAG%-*} - BUILD_VERSION=${DRONE_TAG%-*}
@ -52,22 +52,13 @@ steps:
DOCKER_AUTOTAG_VERSION: ${DRONE_TAG} DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
when: when:
ref: ref:
- refs/heads/main - refs/heads/master
- refs/tags/** - refs/tags/**
depends_on: depends_on:
- dryrun - dryrun
- name: changelog
image: thegeeklab/git-chglog
commands:
- git fetch -tq
- git-chglog --no-color --no-emoji ${DRONE_TAG:---next-tag unreleased unreleased}
- git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
depends_on:
- tags
- name: publish-dockerhub - name: publish-dockerhub
image: thegeeklab/drone-docker-buildx:20 image: plugins/docker:19
settings: settings:
build_args: build_args:
- BUILD_VERSION=${DRONE_TAG%-*} - BUILD_VERSION=${DRONE_TAG%-*}
@ -79,13 +70,13 @@ steps:
from_secret: docker_username from_secret: docker_username
when: when:
ref: ref:
- refs/heads/main - refs/heads/master
- refs/tags/** - refs/tags/**
depends_on: depends_on:
- changelog - tags
- name: publish-quay - name: publish-quay
image: thegeeklab/drone-docker-buildx:20 image: plugins/docker:19
settings: settings:
build_args: build_args:
- BUILD_VERSION=${DRONE_TAG%-*} - BUILD_VERSION=${DRONE_TAG%-*}
@ -98,10 +89,10 @@ steps:
from_secret: quay_username from_secret: quay_username
when: when:
ref: ref:
- refs/heads/main - refs/heads/master
- refs/tags/** - refs/tags/**
depends_on: depends_on:
- changelog - tags
- name: publish-gitea - name: publish-gitea
image: plugins/gitea-release image: plugins/gitea-release
@ -121,7 +112,7 @@ steps:
trigger: trigger:
ref: ref:
- refs/heads/main - refs/heads/master
- refs/pull/** - refs/pull/**
- refs/tags/** - refs/tags/**
@ -183,7 +174,7 @@ steps:
trigger: trigger:
ref: ref:
- refs/heads/main - refs/heads/master
- refs/tags/** - refs/tags/**
status: status:
- success - success
@ -194,6 +185,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: 2bc6998878baf263dbda96a4c7946551fffc788c2738660b4ebee62887f375d0 hmac: 5352100ce9aa90a12a4033550a8783ffbd37a1329215d236864676d0eea8440a
... ...

1
.gitignore vendored
View File

@ -1,2 +1 @@
test/ test/
CHANGELOG.md

2
CHANGELOG.md Normal file
View File

@ -0,0 +1,2 @@
- ENHANCEMENT
- Switch to `org.opencontainers` container labels

View File

@ -1,4 +1,4 @@
FROM thegeeklab/nginx:latest@sha256:1c97c8395046bf2eaa9e758661581d42a9857dcefc6bcf07908dac55dbf26082 FROM thegeeklab/nginx:latest
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>" LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>" LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@ -9,7 +9,7 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/kan
ARG BUILD_VERSION ARG BUILD_VERSION
# renovate: datasource=github-releases depName=kanboard/kanboard # renovate: datasource=github-releases depName=kanboard/kanboard
ENV KANBOARD_VERSION="${BUILD_VERSION:-v1.2.19}" ENV KANBOARD_VERSION="${BUILD_VERSION:-v1.2.16}"
ADD overlay/ / ADD overlay/ /

View File

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2021 Robert Kaussow <mail@thegeeklab.de> Copyright (c) 2020 Robert Kaussow <mail@geeklabor.de>
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -6,7 +6,7 @@ Custom image for Kanboard Kanban project management
[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/kanboard) [![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/kanboard)
[![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/kanboard) [![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/kanboard)
[![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/kanboard) [![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/kanboard)
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/kanboard/src/branch/main/LICENSE) [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/kanboard/src/branch/master/LICENSE)
> **WARNING**: Since release v1.2.1102 this image is a rootless image and may BREAK your setup! > **WARNING**: Since release v1.2.1102 this image is a rootless image and may BREAK your setup!
@ -29,7 +29,30 @@ docker create \
### Docker Compose ### Docker Compose
Please take a look at the [example](https://gitea.rknet.org/docker/kanboard/src/branch/main/docker-compose.yml) compose file from the git repo. Compatible with docker-compose v2 schemas.
```Yaml
---
version: '3'
services:
kanboard:
container_name: kanboard
image: thegeeklab/kanboard:latest
ports:
- "80:8080"
volumes:
- kanboard_data:/var/www/app/data
- kanboard_plugins:/var/www/app/plugins
environment:
KANBOARD_PLUGIN_INSTALLER: "true"
volumes:
kanboard_data:
driver: local
kanboard_plugins:
driver: local
```
## Environment variables ## Environment variables
@ -136,4 +159,4 @@ PHP_SQL_SAFE_MODE=On
## License ## License
This project is licensed under the MIT License - see the [LICENSE](https://gitea.rknet.org/docker/kanboard/src/branch/main/LICENSE) file for details. This project is licensed under the MIT License - see the [LICENSE](https://gitea.rknet.org/docker/kanboard/src/branch/master/LICENSE) file for details.

View File

@ -1,10 +1,10 @@
--- ---
version: "3" version: '3'
services: services:
kanboard: kanboard:
container_name: kanboard container_name: kanboard
image: thegeeklab/kanboard image: thegeeklab/kanboard:latest
ports: ports:
- "80:8080" - "80:8080"
volumes: volumes:

View File

@ -1,7 +1,7 @@
#!/usr/bin/env sh #!/usr/bin/env sh
/usr/local/bin/gomplate -o /etc/php7/php.ini -f /etc/templates/php.ini.tmpl /usr/local/bin/gomplate -V -o /etc/php7/php.ini -f /etc/templates/php.ini.tmpl
/usr/local/bin/gomplate -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl /usr/local/bin/gomplate -V -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl
exec supercronic -split-logs /etc/crontabs/nginx 1>/dev/null & exec supercronic -split-logs /etc/crontabs/nginx 1>/dev/null &
exec php-fpm7 -F & exec php-fpm7 -F &

View File

@ -1,4 +1,16 @@
{ {
"$schema": "https://docs.renovatebot.com/renovate-schema.json", "$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["github>thegeeklab/renovate-presets:docker"] "extends": ["config:base"],
"ignorePresets": [":prHourlyLimit2"],
"regexManagers": [
{
"fileMatch": ["^Dockerfile$"],
"matchStrings": [
"# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>.*?))?\\nENV .*?_VERSION=\"\\${.*:-(?<currentValue>.*)}\"\\s"
]
}
],
"droneci": {
"enabled": false
}
} }