chore(docker): normalize version in docker-compose files (and add dra…

…ft for restic-server)

adminer/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

cert-manager/k8s-install.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
 echo "---------------------------------------------"
 echo "-- cert-manager/k8s-install.sh"
 echo "---------------------------------------------"
@@ -23,3 +25,9 @@ kubectl wait --for condition=established --timeout=60s crd/clusterissuers.cert-m
 kubectl wait --for condition=established --timeout=60s crd/issuers.cert-manager.io
 kubectl wait --for condition=established --timeout=60s crd/certificates.cert-manager.io
 
+# Create mkcert issuer if available
+if which mkcert >/dev/null; then
+  bash $SCRIPT_DIR/cluster-issuer/mkcert.sh
+else
+  echo "mkcert not found, skip ClusterIssuer creation"
+fi

cloudbeaver/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

elasticsearch/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

geonetwork/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

geoserver/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

keycloak/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

kibana/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

kind/quickstart.sh

@@ -59,10 +59,6 @@ kubectl apply -k ${SCRIPT_DIR}/metric-server
 #----------------------------------------
 
 bash $DEVBOX_DIR/cert-manager/k8s-install.sh
-# create mkcert issuer if available
-if which mkcert >/dev/null; then
-    bash $DEVBOX_DIR/cert-manager/cluster-issuer/mkcert.sh
-fi
 
 #----------------------------------------
 # Install ingress controller

mailer/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

mailhog/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

nextcloud/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
   nextcloud:

nexus/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

nfs-server/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

openldap/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

postgis/.env

@@ -1,4 +1,5 @@
 DEVBOX_PORT_PREFIX=127.0.0.1:
 
-POSTGRES_USER=postgis
-POSTGRES_PASSWORD=postgis
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=ChangeIt
+

postgis/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

prometheus/helm/values.yaml

@@ -7,3 +7,21 @@ server:
 # using grafana
 alertmanager:
   enabled: false
+
+# replace instance=NODE_IP:NODE_PORT by instance=NODE_NAME
+# see https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-node-exporter
+prometheus-node-exporter:
+  prometheus:
+    relabelings:
+      - action: replace
+        regex: (.*)
+        replacement: $1
+        sourceLabels: [__meta_kubernetes_pod_node_name]
+        targetLabel: instance
+
+
+# relabel_configs:
+#   .....
+#   # relable the label 'instance' with your pod_node_name 
+#   - source_labels: [__meta_kubernetes_pod_node_name]
+#     target_label: instance

restic-server/README.md

@@ -0,0 +1,4 @@
+# restic-server
+
+Container running [restic/rest-server](https://hub.docker.com/r/restic/rest-server)
+

restic-server/docker-compose.yml

@@ -0,0 +1,22 @@
+version: '3'
+
+services:
+  server:
+    image: restic/rest-server:0.12.1
+    container_name: restic_server
+    volumes:
+      - restic-data:/data
+    environment:
+      - DISABLE_AUTHENTICATION=1
+    ports:
+      - ${RESTIC_PORT:-8100}:8000
+    restart: unless-stopped
+
+volumes:
+  restic-data:
+    name: restic-data
+
+networks:
+  default:
+    name: devbox
+    external: true

sonarqube/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services:
 

traefik/k8s-install.sh

@@ -14,7 +14,6 @@ echo "--   DEVBOX_HOSTNAME=${DEVBOX_ISSUER}"
 echo "--   TRAEFIK_MODE=${TRAEFIK_MODE}"
 echo "---------------------------------------------"
 
-
 # Add helm repository
 helm repo add traefik https://helm.traefik.io/traefik
 
@@ -27,7 +26,7 @@ kubectl create namespace traefik-system --dry-run=client -o yaml | kubectl apply
 # Deploy traefik with helm
 helm -n traefik-system upgrade --install -f ${SCRIPT_DIR}/helm/${TRAEFIK_MODE}.yml traefik traefik/traefik
 
-# Create IngressRoute with dynamic hostname
+# Create Certificate using cert-manager
 cat <<EOF | kubectl -n traefik-system apply -f -
 ---
 apiVersion: cert-manager.io/v1
@@ -41,7 +40,10 @@ spec:
     kind: ClusterIssuer
   dnsNames:
     - traefik.$DEVBOX_HOSTNAME
----
+EOF
+
+# Create IngressRoute with dynamic hostname
+cat <<EOF | kubectl -n traefik-system apply -f -
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
@@ -58,4 +60,4 @@ spec:
           kind: TraefikService
   tls:
     secretName: traefik-tls
-EOF
+EOF

whoami/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3'
 
 services: