Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8381c1ba7d | ||
|
|
4308130cd1 | ||
|
|
721cdac95d | ||
|
|
395fa52962 | ||
|
|
45e5c473ff | ||
|
|
1c3648f0f4 | ||
|
|
5b707728b8 | ||
|
|
c19c211839 | ||
|
|
aace535914 | ||
|
|
59982ef762 | ||
|
|
56c6fef178 | ||
|
|
46b1b32708 | ||
|
|
519101023c | ||
|
|
82b4f51390 | ||
|
|
3256939ac7 | ||
|
|
02e4c5318d | ||
|
|
f06abd2838 | ||
|
|
f0297f2d2c |
+64
-3
@@ -88,10 +88,71 @@ volumes:
|
|||||||
path: /var/lib/drone/cache/.gradle
|
path: /var/lib/drone/cache/.gradle
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
event:
|
event:
|
||||||
include:
|
include:
|
||||||
- push
|
- tag
|
||||||
- custom
|
- custom
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
name: deploy image
|
||||||
|
type: docker
|
||||||
|
|
||||||
|
platform:
|
||||||
|
os: linux
|
||||||
|
arch: arm64
|
||||||
|
|
||||||
|
clone:
|
||||||
|
disable: true
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: clone
|
||||||
|
image: alpine/git
|
||||||
|
environment:
|
||||||
|
SSH_KEY:
|
||||||
|
from_secret: ssh_key
|
||||||
|
commands:
|
||||||
|
- mkdir $HOME/.ssh
|
||||||
|
- echo "$SSH_KEY" > $HOME/.ssh/id_ed25519
|
||||||
|
- chmod 600 $HOME/.ssh/id_ed25519
|
||||||
|
- touch $HOME/.ssh/known_hosts
|
||||||
|
- chmod 600 $HOME/.ssh/known_hosts
|
||||||
|
- ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
|
||||||
|
- git clone ssh://giteajim@git.2martens.de:22/2martens/cloud-configuration.git .
|
||||||
|
- git checkout main
|
||||||
|
- name: modify deployed image
|
||||||
|
image: alpine
|
||||||
|
commands:
|
||||||
|
- sed -i -r "s/(wahlrecht_image_version:).*/\1\ ${DRONE_SEMVER}/" ansible/inventories/host_vars/api-server/public.yaml
|
||||||
|
- name: save modified variable file
|
||||||
|
image: alpine/git
|
||||||
|
environment:
|
||||||
|
SSH_KEY:
|
||||||
|
from_secret: ssh_key
|
||||||
|
commands:
|
||||||
|
- mkdir $HOME/.ssh
|
||||||
|
- echo "$SSH_KEY" > $HOME/.ssh/id_ed25519
|
||||||
|
- chmod 600 $HOME/.ssh/id_ed25519
|
||||||
|
- touch $HOME/.ssh/known_hosts
|
||||||
|
- chmod 600 $HOME/.ssh/known_hosts
|
||||||
|
- ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
|
||||||
|
- git add ansible/inventories/host_vars/api-server/public.yaml
|
||||||
|
- git commit -m "[Drone] Changed wahlrecht_image_version to ${DRONE_SEMVER}"
|
||||||
|
- git push origin main
|
||||||
|
- name: deploy image
|
||||||
|
image: plugins/ansible:latest
|
||||||
|
settings:
|
||||||
|
playbook: ansible/deploy_spring.yaml
|
||||||
|
inventory: ansible/inventories/production
|
||||||
|
private_key:
|
||||||
|
from_secret: ssh_key
|
||||||
|
vault_password:
|
||||||
|
from_secret: vault_password
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
target:
|
||||||
|
- production
|
||||||
|
event:
|
||||||
|
include:
|
||||||
|
- promote
|
||||||
|
- rollback
|
||||||
|
|||||||
@@ -2,11 +2,13 @@ package de.twomartens.wahlrecht.property
|
|||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema
|
import io.swagger.v3.oas.annotations.media.Schema
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties
|
import org.springframework.boot.context.properties.ConfigurationProperties
|
||||||
import org.springframework.boot.context.properties.bind.ConstructorBinding
|
|
||||||
import org.springframework.cloud.context.config.annotation.RefreshScope
|
import org.springframework.cloud.context.config.annotation.RefreshScope
|
||||||
import java.time.ZoneId
|
import java.time.ZoneId
|
||||||
|
|
||||||
@RefreshScope
|
@RefreshScope
|
||||||
@ConfigurationProperties(prefix = "de.twomartens.wahlrecht")
|
@ConfigurationProperties(prefix = "de.twomartens.wahlrecht")
|
||||||
@Schema(description = "Properties, to configure this Application")
|
@Schema(description = "Properties, to configure this Application")
|
||||||
data class ServiceProperties @ConstructorBinding constructor(val defaultTimeZone: ZoneId, val greeting: String)
|
class ServiceProperties {
|
||||||
|
lateinit var defaultTimeZone: ZoneId
|
||||||
|
lateinit var greeting: String
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
spring:
|
spring:
|
||||||
config:
|
config:
|
||||||
import:
|
import:
|
||||||
- "classpath:config/wahlrecht.yaml"
|
- "configserver:http://configserver:8888/config"
|
||||||
- "optional:configserver:http://configserver:8888/config"
|
kafka:
|
||||||
|
bootstrap-servers:
|
||||||
|
- kafka:9092
|
||||||
|
|||||||
@@ -28,10 +28,6 @@ spring:
|
|||||||
name: wahlrecht
|
name: wahlrecht
|
||||||
main:
|
main:
|
||||||
banner-mode: off
|
banner-mode: off
|
||||||
kafka:
|
|
||||||
bootstrap-servers:
|
|
||||||
- localhost:9092
|
|
||||||
- kafka:9092
|
|
||||||
profiles:
|
profiles:
|
||||||
default: dev
|
default: dev
|
||||||
data.mongodb:
|
data.mongodb:
|
||||||
@@ -42,6 +38,8 @@ spring:
|
|||||||
resourceserver:
|
resourceserver:
|
||||||
jwt:
|
jwt:
|
||||||
jwk-set-uri: https://id.2martens.de/realms/2martens/protocol/openid-connect/certs
|
jwk-set-uri: https://id.2martens.de/realms/2martens/protocol/openid-connect/certs
|
||||||
|
application:
|
||||||
|
name: wahlrecht
|
||||||
|
|
||||||
springdoc:
|
springdoc:
|
||||||
swagger-ui:
|
swagger-ui:
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
de.twomartens.wahlrecht:
|
de.twomartens.wahlrecht:
|
||||||
greeting: "Moin %s, you are great"
|
greeting: "Moin %s, you are test"
|
||||||
|
|||||||
Reference in New Issue
Block a user