1
0
Fork 1
mirror of https://gitlab.com/mangadex-pub/mangadex_at_home.git synced 2024-01-19 02:48:37 +00:00

Merge branch 'grafana-cicd-pains' into 'master'

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

See merge request mangadex-pub/mangadex_at_home!78
This commit is contained in:
carbotaniuman 2021-02-21 18:19:49 +00:00
commit 3812fcab47
6 changed files with 779 additions and 673 deletions

View file

@ -4,32 +4,39 @@ stages:
- publish_latest - publish_latest
- publish_docker - publish_docker
cache:
paths:
- build/libs/
build: build:
image: openjdk:8 image: openjdk:8
stage: build stage: build
script: script:
- export VERSION="$CI_COMMIT_REF_NAME"
- ./gradlew build - ./gradlew build
- "ls -lah build/libs" - "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: publish:
image: alpine image: alpine
stage: publish stage: publish
before_script: before_script:
- apk update && apk add git zip - apk update && apk add git zip
- export VERSION=`git describe --tags --dirty` - export VERSION="$CI_COMMIT_REF_NAME"
script: script:
- cp build/libs/mangadex_at_home-${VERSION}-all.jar ./ - 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 - zip -r9 mangadex_at_home-${VERSION}.zip mangadex_at_home-${VERSION}-all.jar settings.sample.json
dependencies:
- build
artifacts: artifacts:
name: "mangadex_at_home" name: "mangadex_at_home"
paths: paths:
- "*.jar" - "mangadex_at_home-*-all.jar"
- "mangadex_at_home-*.zip" - "mangadex_at_home-*.zip"
- settings.sample.yaml - "settings.sample.yaml"
publish_docker: publish_docker:
image: docker:git image: docker:git
@ -40,9 +47,10 @@ publish_docker:
- docker:dind - docker:dind
before_script: before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY} - 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: script:
- mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar - 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}:${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 ### Added
### Changed ### 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 ### Deprecated
### Removed ### Removed
### Fixed ### Fixed
- [2020-02-21] Fix pipeline [@_tde9]
### Security ### Security

View file

@ -10,7 +10,7 @@ plugins {
} }
group = "com.mangadex" 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" mainClassName = "mdnet.MainKt"
repositories { 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: prometheus:
container_name: prometheus container_name: prometheus
image: prom/prometheus image: prom/prometheus:v2.24.1
user: "root" user: "root"
group_add: group_add:
- 0 - 0
@ -50,7 +50,7 @@ services:
grafana: grafana:
container_name: grafana container_name: grafana
image: grafana/grafana image: grafana/grafana:7.4.0
user: "root" user: "root"
group_add: group_add:
- 0 - 0

File diff suppressed because it is too large Load diff