Compare commits
No commits in common. "f3e99510d5aa8f19cace30e8354050b6eb055f03" and "85a7778581141a7c0b8006fb8d20a2c482f814ad" have entirely different histories.
f3e99510d5
...
85a7778581
15 changed files with 26 additions and 47 deletions
|
|
@ -1,24 +0,0 @@
|
||||||
---
|
|
||||||
name: Kaniko deployments
|
|
||||||
|
|
||||||
on: # yamllint disable-line rule:truthy
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'main'
|
|
||||||
- 'ci/debug'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
nextcloud:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
- uses: https://code.forgejo.org/actions/checkout@v4
|
|
||||||
- name: Kaniko build
|
|
||||||
uses: aevea/action-kaniko@v0.13.0
|
|
||||||
with:
|
|
||||||
image: catalin/fukuops
|
|
||||||
username: kaniko
|
|
||||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
|
||||||
cache: true
|
|
||||||
registry: git.roboces.dev
|
|
||||||
tag: nextcloud-30.0.1
|
|
||||||
path: docker/nextcloud
|
|
||||||
|
|
@ -5,6 +5,7 @@ on: # yamllint disable-line rule:truthy
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- 'main'
|
- 'main'
|
||||||
|
- 'ci/debug'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
authentik:
|
authentik:
|
||||||
|
|
@ -27,9 +28,7 @@ jobs:
|
||||||
TF_VAR_portainer_client_id: ${{ secrets.TF_VAR_portainer_client_id }}
|
TF_VAR_portainer_client_id: ${{ secrets.TF_VAR_portainer_client_id }}
|
||||||
TF_VAR_portainer_client_secret: ${{ secrets.TF_VAR_portainer_client_secret }}
|
TF_VAR_portainer_client_secret: ${{ secrets.TF_VAR_portainer_client_secret }}
|
||||||
TF_VAR_paperless_client_id: ${{ secrets.TF_VAR_paperless_client_id }}
|
TF_VAR_paperless_client_id: ${{ secrets.TF_VAR_paperless_client_id }}
|
||||||
TF_VAR_paperless_client_secret: ${{ secrets.TF_VAR_paperless_secret }}
|
TF_VAR_paperless_client_secret: ${{ secrets.TF_VAR_paperless_client_secret }}
|
||||||
TF_VAR_netbird_client_id: ${{ secrets.TF_VAR_netbird_client_id }}
|
|
||||||
TF_VAR_netbird_client_secret: ${{ secrets.TF_VAR_netbird_client_secret }}
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
||||||
run: |
|
run: |
|
||||||
|
|
|
||||||
6
Makefile
6
Makefile
|
|
@ -4,10 +4,16 @@ lint--pre-commit:
|
||||||
lint--kubeconform:
|
lint--kubeconform:
|
||||||
kubeconform -strict -ignore-missing-schemas k8s/
|
kubeconform -strict -ignore-missing-schemas k8s/
|
||||||
|
|
||||||
|
SHELl=/bin/bash
|
||||||
|
lint--kubescore:
|
||||||
|
kube-score score $$(find k8s -type f -print -name "*.yaml")
|
||||||
|
|
||||||
lint--tflint:
|
lint--tflint:
|
||||||
tflint --recursive
|
tflint --recursive
|
||||||
|
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
make lint--pre-commit
|
make lint--pre-commit
|
||||||
make lint--kubeconform
|
make lint--kubeconform
|
||||||
|
make lint--kube
|
||||||
make lint--tflint
|
make lint--tflint
|
||||||
|
|
|
||||||
|
|
@ -2,4 +2,3 @@
|
||||||
|
|
||||||
[](https://git.roboces.dev/catalin/fukuops/actions)
|
[](https://git.roboces.dev/catalin/fukuops/actions)
|
||||||
[](https://git.roboces.dev/catalin/fukuops/actions)
|
[](https://git.roboces.dev/catalin/fukuops/actions)
|
||||||
[](https://git.roboces.dev/catalin/fukuops/actions)
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
x-runner-common: &runner-common
|
x-runner-common: &runner-common
|
||||||
image: code.forgejo.org/forgejo/runner:4.0.0
|
image: code.forgejo.org/forgejo/runner:3.5.1
|
||||||
links:
|
links:
|
||||||
- docker-in-docker
|
- docker-in-docker
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
dashboard:
|
dashboard:
|
||||||
image: netbirdio/dashboard:v2.6.2
|
image: netbirdio/dashboard:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- 8005:80
|
- 8005:80
|
||||||
|
|
@ -23,7 +23,7 @@ services:
|
||||||
max-size: "500m"
|
max-size: "500m"
|
||||||
max-file: "2"
|
max-file: "2"
|
||||||
signal:
|
signal:
|
||||||
image: netbirdio/signal:0.30.3
|
image: netbirdio/signal:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- netbird-signal:/var/lib/netbird
|
- netbird-signal:/var/lib/netbird
|
||||||
|
|
@ -35,7 +35,7 @@ services:
|
||||||
max-size: "500m"
|
max-size: "500m"
|
||||||
max-file: "2"
|
max-file: "2"
|
||||||
relay:
|
relay:
|
||||||
image: netbirdio/relay:0.30.3
|
image: netbirdio/relay:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
NB_LOG_LEVEL: ${NB_LOG_LEVEL:-info}
|
NB_LOG_LEVEL: ${NB_LOG_LEVEL:-info}
|
||||||
|
|
@ -50,7 +50,7 @@ services:
|
||||||
max-size: "500m"
|
max-size: "500m"
|
||||||
max-file: "2"
|
max-file: "2"
|
||||||
management:
|
management:
|
||||||
image: netbirdio/management:0.30.3
|
image: netbirdio/management:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
- dashboard
|
- dashboard
|
||||||
|
|
@ -74,9 +74,8 @@ services:
|
||||||
max-file: "2"
|
max-file: "2"
|
||||||
environment:
|
environment:
|
||||||
- NETBIRD_STORE_ENGINE_POSTGRES_DSN=
|
- NETBIRD_STORE_ENGINE_POSTGRES_DSN=
|
||||||
|
|
||||||
coturn:
|
coturn:
|
||||||
image: coturn/coturn:4.6
|
image: coturn/coturn:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
domainname: vpn.fukurokuju.dev
|
domainname: vpn.fukurokuju.dev
|
||||||
volumes:
|
volumes:
|
||||||
|
|
@ -91,7 +90,7 @@ services:
|
||||||
max-file: "2"
|
max-file: "2"
|
||||||
|
|
||||||
peer-1:
|
peer-1:
|
||||||
image: netbirdio/netbird:0.30.3
|
image: netbirdio/netbird:0.29.4
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ${NETBIRD_PEER_VOLUME:-/mnt/nas1/shared/netbird/peer-1}/data:/etc/netbird
|
- ${NETBIRD_PEER_VOLUME:-/mnt/nas1/shared/netbird/peer-1}/data:/etc/netbird
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM nextcloud:30.0.1-apache
|
FROM nextcloud:30.0.0-apache
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
\
|
\
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ services:
|
||||||
- nextcloud
|
- nextcloud
|
||||||
|
|
||||||
nextcloud:
|
nextcloud:
|
||||||
image: git.roboces.dev/catalin/fukuops:nextcloud-30.0.1
|
image: git.roboces.dev/catalin/fukuops:nextcloud-30.0.0
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/nas1/legacy-storage/cloud/cloud/data:/var/www/html/data
|
- /mnt/nas1/legacy-storage/cloud/cloud/data:/var/www/html/data
|
||||||
- /mnt/nas1/legacy-storage/cloud/cloud/config:/var/www/html/config
|
- /mnt/nas1/legacy-storage/cloud/cloud/config:/var/www/html/config
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ services:
|
||||||
|
|
||||||
webserver:
|
webserver:
|
||||||
|
|
||||||
image: ghcr.io/paperless-ngx/paperless-ngx:2.13.2
|
image: ghcr.io/paperless-ngx/paperless-ngx:2.12.1
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- 8002:8000
|
- 8002:8000
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
vaultwarden:
|
vaultwarden:
|
||||||
image: vaultwarden/server:1.32.3-alpine
|
image: vaultwarden/server:1.32.0-alpine
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: ${DATABASE_URL}
|
DATABASE_URL: ${DATABASE_URL}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ spec:
|
||||||
sources:
|
sources:
|
||||||
- chart: elasticsearch
|
- chart: elasticsearch
|
||||||
repoURL: registry-1.docker.io/bitnamicharts
|
repoURL: registry-1.docker.io/bitnamicharts
|
||||||
targetRevision: 21.3.22
|
targetRevision: 21.3.18
|
||||||
helm:
|
helm:
|
||||||
valuesObject:
|
valuesObject:
|
||||||
service:
|
service:
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ spec:
|
||||||
sources:
|
sources:
|
||||||
- chart: factorio-server-charts
|
- chart: factorio-server-charts
|
||||||
repoURL: https://sqljames.github.io/factorio-server-charts/
|
repoURL: https://sqljames.github.io/factorio-server-charts/
|
||||||
targetRevision: 2.0.*
|
targetRevision: 1.2.*
|
||||||
helm:
|
helm:
|
||||||
valuesObject:
|
valuesObject:
|
||||||
rcon:
|
rcon:
|
||||||
|
|
@ -20,9 +20,9 @@ spec:
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/hostname: agent1
|
kubernetes.io/hostname: agent1
|
||||||
image:
|
image:
|
||||||
tag: latest
|
tag: 1.1.101
|
||||||
factorioServer:
|
factorioServer:
|
||||||
save_name: fukurokuju-space
|
save_name: fukurokuju
|
||||||
admin_list:
|
admin_list:
|
||||||
- Phireh
|
- Phireh
|
||||||
account:
|
account:
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ spec:
|
||||||
sources:
|
sources:
|
||||||
- chart: forgejo
|
- chart: forgejo
|
||||||
repoURL: code.forgejo.org/forgejo-helm
|
repoURL: code.forgejo.org/forgejo-helm
|
||||||
targetRevision: 10.0.1
|
targetRevision: 8.2.3
|
||||||
helm:
|
helm:
|
||||||
valuesObject:
|
valuesObject:
|
||||||
replicaCount: 2
|
replicaCount: 2
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ spec:
|
||||||
sources:
|
sources:
|
||||||
- chart: renovate
|
- chart: renovate
|
||||||
repoURL: https://docs.renovatebot.com/helm-charts
|
repoURL: https://docs.renovatebot.com/helm-charts
|
||||||
targetRevision: 38.132.*
|
targetRevision: 38.95.*
|
||||||
helm:
|
helm:
|
||||||
valuesObject:
|
valuesObject:
|
||||||
renovate:
|
renovate:
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: miniflux
|
- name: miniflux
|
||||||
image: miniflux/miniflux:2.2.2
|
image: miniflux/miniflux:2.2.1
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
securityContext:
|
securityContext:
|
||||||
allowPrivilegeEscalation: false
|
allowPrivilegeEscalation: false
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue