.drone.yml

@@ -1,30 +1,36 @@
+type: docker
 kind: pipeline
 name: Serverctl
 
 steps:
-  - name: terraform plan
+  - name: test
-    image: alpine
+    image: harbor.front.kjuulh.io/docker-proxy/library/bash:latest
-    environment:
-      HCLOUD_TOKEN:
-        from_secret: serverctl_hcloud_token
-      ACCESS_KEY:
-        from_secret: serverctl_access_key
-      SECRET_KEY:
-        from_secret: serverctl_secret_key
-      SSH_ZIP_KEY:
-        from_secret: serverctl_ssh_zip_key
-      HCLOUD_SSH_KEY_ID:
-        from_secret: serverctl_hcloud_ssh_key_id
     commands:
-      - apk --update add curl zip ansible python3
+      - echo 'Run tests'
-      - cd infrastructure && ./unzip-ssh-keys.sh "$SSH_ZIP_KEY" && cd ..
+  #
-      - curl --silent --output terraform.zip "https://releases.hashicorp.com/terraform/1.1.6/terraform_1.1.6_linux_amd64.zip"
+  #  - name: terraform plan
-      - unzip terraform.zip ; rm -f terraform.zip; chmod +x terraform
+  #    image: alpine
-      - mkdir -p ${HOME}/bin ; export PATH=${PATH}:${HOME}/bin; mv terraform ${HOME}/bin/
+  #    environment:
-      - terraform -v
+  #      HCLOUD_TOKEN:
-      - cd infrastructure/create-resources
+  #        from_secret: serverctl_hcloud_token
-      - terraform init -backend-config="access_key=$ACCESS_KEY" -backend-config="secret_key=$SECRET_KEY"
+  #      ACCESS_KEY:
-      - terraform validate
+  #        from_secret: serverctl_access_key
-      - terraform apply -auto-approve -var "hcloud_token=$HCLOUD_TOKEN" -var "pvt_key=../ssh_keys/id_ed25519" -var "pub_key=../ssh_keys/id_ed25519.pub" -var "hcloud_serverctl_ssh_key_id=$HCLOUD_SSH_KEY_ID"
+  #      SECRET_KEY:
-      - cd ansible
+  #        from_secret: serverctl_secret_key
-      - ANSIBLE_HOST_KEY_CHECKING=False /usr/bin/ansible-playbook -u root --key-file '../../ssh_keys/id_ed25519'  -e 'pub_key=../../ssh_keys/id_ed25519.pub' site.yml
+  #      SSH_ZIP_KEY:
+  #        from_secret: serverctl_ssh_zip_key
+  #      HCLOUD_SSH_KEY_ID:
+  #        from_secret: serverctl_hcloud_ssh_key_id
+  #    commands:
+  #      - apk --update add curl zip ansible python3
+  #      - cd infrastructure && ./unzip-ssh-keys.sh "$SSH_ZIP_KEY" && cd ..
+  #      - curl --silent --output terraform.zip "https://releases.hashicorp.com/terraform/1.1.6/terraform_1.1.6_linux_amd64.zip"
+  #      - unzip terraform.zip ; rm -f terraform.zip; chmod +x terraform
+  #      - mkdir -p ${HOME}/bin ; export PATH=${PATH}:${HOME}/bin; mv terraform ${HOME}/bin/
+  #      - terraform -v
+  #      - cd infrastructure/create-resources
+  #      - terraform init -backend-config="access_key=$ACCESS_KEY" -backend-config="secret_key=$SECRET_KEY"
+  #      - terraform validate
+  #      - terraform apply -auto-approve -var "hcloud_token=$HCLOUD_TOKEN" -var "pvt_key=../ssh_keys/id_ed25519" -var "pub_key=../ssh_keys/id_ed25519.pub" -var "hcloud_serverctl_ssh_key_id=$HCLOUD_SSH_KEY_ID"
+  #      - cd ansible
+  #      - ANSIBLE_HOST_KEY_CHECKING=False /usr/bin/ansible-playbook -u root --key-file '../../ssh_keys/id_ed25519'  -e 'pub_key=../../ssh_keys/id_ed25519.pub' site.yml

docker-compose.yml

@@ -55,7 +55,7 @@ services:
 
 # Logging
   loki:
-    image: grafana/loki:2.4.2
+    image: grafana/loki:2.6.1
     ports:
       - 3100
     networks:
@@ -66,7 +66,7 @@ services:
     logging: *loki-logging
 
   promtail:
-    image: grafana/promtail:2.4.2
+    image: grafana/promtail:2.6.1
     volumes:
       - ./services/logs/promtail/config.yaml:/mnt/config/promtail-config.yaml
       - /var/lib/docker/containers:/host/containers

infrastructure/create-resources/provider.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     hcloud = {
       source  = "hetznercloud/hcloud"
-      version = "1.32.2"
+      version = "1.35.2"
     }
   }
 

services/db/migrations/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17-bullseye
+FROM golang:1.19-bullseye
 
 RUN go install github.com/jackc/tern@latest
 

services/entry/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17-bullseye
+FROM golang:1.19-bullseye
 
 RUN go install github.com/cosmtrek/air@latest
 # Development don't need this

services/entry/go.mod

@@ -1,6 +1,6 @@
 module serverctl
 
-go 1.17
+go 1.19
 
 require (
 	github.com/Microsoft/go-winio v0.4.17 // indirect