Commits · master · devops / k8s-demo / k8s-demo-app

26 Jan, 2021 3 commits
- Update .gitlab-ci.yml · ba2d11a0
  Björn Bartels authored Jan 26, 2021
  
  ba2d11a0
- Update bin/build-env.sh · 4cf88dad
  Björn Bartels authored Jan 26, 2021
  
  4cf88dad
- Update Dockerfile · a5f22d1b
  Björn Bartels authored Jan 26, 2021
  
  a5f22d1b
17 Dec, 2020 5 commits
- Update Dockerfile · e3901990
  Björn Bartels authored Dec 17, 2020
  
  e3901990
- Update Dockerfile · 08c6ac09
  Björn Bartels authored Dec 17, 2020
  
  08c6ac09
- Update Dockerfile · 2008c07b
  Björn Bartels authored Dec 17, 2020
  
  2008c07b
- Update Dockerfile · 1807858a
  Björn Bartels authored Dec 17, 2020
  
  1807858a
- Update Dockerfile, .gitlab-ci.yml files · 472d76d4
  Björn Bartels authored Dec 17, 2020
  
  472d76d4
28 Oct, 2020 9 commits
- Merge branch 'release' into 'master' · bb1f2b30
  Björn Bartels authored Oct 28, 2020
```
Merge branch 'master' into 'release'

See merge request !19
```
  bb1f2b30
- Merge branch 'master' into 'release' · 7d17388e
  Björn Bartels authored Oct 28, 2020
```
Master

See merge request !18
```
  7d17388e
- Merge branch 'docker' into 'master' · 96c14b88
  Björn Bartels authored Oct 28, 2020
```
Upd CI cfg

See merge request !17
```
  96c14b88
- Upd CI cfg · 91529a89
  Björn Bartels authored Oct 28, 2020
  
  91529a89
- Merge branch 'release' into 'master' · 6e1738cb
  Björn Bartels authored Oct 28, 2020
```
Merge branch 'master' into 'release'

See merge request !16
```
  6e1738cb
- Merge branch 'master' into 'release' · 0f54b801
  Björn Bartels authored Oct 28, 2020
```
Merge branch 'release' into 'master'

See merge request !15
```
  0f54b801
- Merge branch 'docker' into 'master' · ae60e138
  Björn Bartels authored Oct 28, 2020
```
Docker

See merge request !14
```
  ae60e138
- Docker · 70858fb0
  Björn Bartels authored Oct 28, 2020
  
  70858fb0
- Merge branch 'release' into 'master' · 77e7dfff
  Björn Bartels authored Oct 27, 2020
```
Merge branch 'master' into 'release'

See merge request !13
```
  77e7dfff
27 Oct, 2020 9 commits
- Merge branch 'master' into 'release' · 1539a0d8
  Björn Bartels authored Oct 27, 2020
```
Master

See merge request !12
```
  1539a0d8
- Merge branch 'docker' into 'master' · ff82a130
  Björn Bartels authored Oct 27, 2020
```
Upd CI cfg

See merge request !11
```
  ff82a130
- Upd CI cfg · 9d81c3c1
  Björn Bartels authored Oct 27, 2020
  
  9d81c3c1
- Merge branch 'release' into 'master' · 5b58d8c9
  Björn Bartels authored Oct 27, 2020
```
Merge branch 'master' into 'release'

See merge request !10
```
  5b58d8c9
- Merge branch 'master' into 'release' · 6d266d57
  Björn Bartels authored Oct 27, 2020
```
Master

See merge request !9
```
  6d266d57
- Merge branch 'setup' into 'master' · d914829a
  Björn Bartels authored Oct 27, 2020
```
Upd CI cfg

See merge request !8
```
  d914829a
- Upd CI cfg · 96b30aa9
  Björn Bartels authored Oct 27, 2020
  
  96b30aa9
- Revert "Upd CI cfg" · d75da132
  Björn Bartels authored Oct 27, 2020
```
This reverts commit 20bcc05f.
```
  d75da132
- Upd CI cfg · 20bcc05f
  Björn Bartels authored Oct 27, 2020
  
  20bcc05f
25 Oct, 2020 14 commits
- Merge remote-tracking branch 'origin/release' · 9adbefa4
  Björn Bartels authored Oct 25, 2020
  
  9adbefa4
- Merge branch 'master' into 'release' · 3782bfb1
  Björn Bartels authored Oct 25, 2020
```
Master

See merge request !7
```
  3782bfb1
- Update .gitlab-ci.yml, config/kubernetes/hotfix/ingress.yaml,... · be93f21b
  Björn Bartels authored Oct 25, 2020
```
Update .gitlab-ci.yml, config/kubernetes/hotfix/ingress.yaml, config/kubernetes/staging/ingress.yaml, config/kubernetes/dev/ingress-feature.yaml files
```
  be93f21b
- upd CI cfg · a48d2d76
  Björn Bartels authored Oct 25, 2020
  
  a48d2d76
- Merge remote-tracking branch 'origin/release' · ab675fd0
  Björn Bartels authored Oct 25, 2020
  
  ab675fd0
- Merge branch 'master' into 'release' · 4d9abc6f
  Björn Bartels authored Oct 25, 2020
```
Master

See merge request !6
```
  4d9abc6f
- Update .gitlab-ci.yml, config/kubernetes/hotfix/ingress.yaml,... · 6dab9577
  Björn Bartels authored Oct 25, 2020
```
Update .gitlab-ci.yml, config/kubernetes/hotfix/ingress.yaml, config/kubernetes/staging/ingress.yaml, config/kubernetes/dev/ingress-feature.yaml files
```
  6dab9577
- resolve merge conflicts · bdef44bc
  Björn Bartels authored Oct 25, 2020
  
  bdef44bc
- upd CI cfg · 73d83b3e
  Björn Bartels authored Oct 25, 2020
  
  73d83b3e
- Merge branch 'master' of gitlab.bjoernbartels.earth:devops/k8s-demo/k8s-demo-app · 35bd3871
  Björn Bartels authored Oct 25, 2020
  
  35bd3871
- upd CI cfg · 687760b5
  Björn Bartels authored Oct 25, 2020
  
  687760b5
- Merge branch 'update-ci' into 'master' · de666159
  Björn Bartels authored Oct 25, 2020
```
upd CI cfg

See merge request !5
```
  de666159
- upd CI cfg · 0b1bfcac
  Björn Bartels authored Oct 25, 2020
  
  0b1bfcac
- Merge branch 'ansible' into 'master' · a143cf21
  Björn Bartels authored Oct 25, 2020
```
Ansible

See merge request !4
```
  a143cf21