Fix prom/grafana version, and update grafana + dash to 7.4

This commit is contained in:
Tristan 2021-02-21 18:19:49 +00:00 committed by carbotaniuman
parent 964b97b1d5
commit 2eb0a3d475
6 changed files with 779 additions and 673 deletions

View File

@ -4,32 +4,39 @@ stages:
- publish_latest
- publish_docker
cache:
paths:
- build/libs/
build:
image: openjdk:8
stage: build
script:
- export VERSION="$CI_COMMIT_REF_NAME"
- ./gradlew build
- "ls -lah build/libs"
cache:
key: "mangadex_at_home-build"
paths:
- /root/.gradle
artifacts:
name: "mangadex_at_home"
paths:
- "build/libs/mangadex_at_home-*-all.jar"
publish:
image: alpine
stage: publish
before_script:
- apk update && apk add git zip
- export VERSION=`git describe --tags --dirty`
- export VERSION="$CI_COMMIT_REF_NAME"
script:
- cp build/libs/mangadex_at_home-${VERSION}-all.jar ./
- zip -r9 mangadex_at_home-${VERSION}.zip mangadex_at_home-${VERSION}-all.jar settings.sample.json
dependencies:
- build
artifacts:
name: "mangadex_at_home"
paths:
- "*.jar"
- "mangadex_at_home-*-all.jar"
- "mangadex_at_home-*.zip"
- settings.sample.yaml
- "settings.sample.yaml"
publish_docker:
image: docker:git
@ -40,9 +47,10 @@ publish_docker:
- docker:dind
before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
- export VERSION=`git describe --tags --dirty`
- export VERSION="$CI_COMMIT_REF_NAME"
dependencies:
- build
script:
- mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
- docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:latest .
- docker build . -t ${CI_REGISTRY_IMAGE}:${VERSION}
- docker push ${CI_REGISTRY_IMAGE}:${VERSION}
- docker push ${CI_REGISTRY_IMAGE}:latest

View File

@ -8,12 +8,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
### Changed
- [2020-02-10] Fix Prometheus to 2.24.1 and Grafana to 7.4.0 [@_tde9]
- [2020-02-10] Update and rearrange the embedded dashboard with the new Timeseries panel from Grafana 7.4 [@_tde9]
- [2020-02-10] Update sample dashboard screenshot thanks to DLMSweet :smile: [@_tde9]
### Deprecated
### Removed
### Fixed
- [2020-02-21] Fix pipeline [@_tde9]
### Security

View File

@ -10,7 +10,7 @@ plugins {
}
group = "com.mangadex"
version = "git describe --tags --dirty".execute().text.trim()
version = System.getenv().getOrDefault("VERSION", 'git describe --tags --dirty'.execute().text.trim())
mainClassName = "mdnet.MainKt"
repositories {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 415 KiB

After

Width:  |  Height:  |  Size: 582 KiB

View File

@ -31,7 +31,7 @@ services:
prometheus:
container_name: prometheus
image: prom/prometheus
image: prom/prometheus:v2.24.1
user: "root"
group_add:
- 0
@ -50,7 +50,7 @@ services:
grafana:
container_name: grafana
image: grafana/grafana
image: grafana/grafana:7.4.0
user: "root"
group_add:
- 0

File diff suppressed because it is too large Load Diff