moved from alpine to debian

.drone.yml

@@ -1,34 +0,0 @@
----
-kind: pipeline
-type: docker
-name: build
-
-steps:
-  - name: build image
-    image: plugins/docker
-    settings:
-      repo: jtom38/cloudflare-ddns
-      username: jtom38
-      password:
-        from_secret: DockerPushPat
-trigger:
-  branch:
-    include:
-      - main
-      - releases/*
-  event:
-    exclude:
-      - pull_request
-
----
-kind: pipeline
-type: docker
-name: compile
-steps:
-  - name: Compile project
-    image: golang:latest
-    commands:
-      - go build
-trigger:
-  event:
-    - pull_request

.github/workflows/docker.build.yaml

@@ -0,0 +1,64 @@
+name: Docker
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+on:
+  #schedule:
+  #  - cron: '21 19 * * *'
+  push:
+    branches: [ master ]
+    # Publish semver tags as releases.
+    tags: [ 'v*.*.*' ]
+  #pull_request:
+  #  branches: [ master ]
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          #images: ${{ env.REGISTRY }}/newsbot.worker
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,14 +1,11 @@
-FROM golang:1.19 as build
+FROM golang:1.20 as build
 
 COPY . /app
 WORKDIR /app
 RUN go build .
 
-FROM alpine:latest as app
+FROM debian:latest as app
 
-RUN apk --no-cache add bash libc6-compat && \
+COPY --from=build /app/ddns /app
-    mkdir /app 
 
-COPY --from=build /app/ddns /usr/bin/ddns
+CMD [ "/app/ddns" ]
-
-CMD [ "ddns" ]

config.go

@@ -6,17 +6,26 @@ import (
 	"log"
 	"os"
 	"strconv"
+	"strings"
 
 	"github.com/joho/godotenv"
+	"gopkg.in/yaml.v3"
 )
 
 const (
-	ConfigEmail = "EMAIL"
+	ConfigEmail  = "EMAIL"
-	ConfigToken = "API_TOKEN"
+	ConfigToken  = "API_TOKEN"
 	ConfigDomain = "DOMAIN"
-	ConfigHosts = "HOSTS"
+	ConfigHosts  = "HOSTS"
 )
 
+type ConfigModel struct {
+	Email  string   `yaml:"Email"`
+	Token  string   `yaml:"Token"`
+	Domain string   `yaml:"Domain"`
+	Hosts  []string `yaml:"Hosts"`
+}
+
 type ConfigClient struct{}
 
 func NewConfigClient() ConfigClient {
@@ -26,6 +35,35 @@ func NewConfigClient() ConfigClient {
 	return c
 }
 
+func (cc *ConfigClient) LoadConfig() ConfigModel {
+	// load yaml first
+
+	model, err := LoadYaml("config.yaml")
+	if err != nil {
+		log.Print(err)
+	}
+
+	// refresh env to make sure its current
+	cc.RefreshEnv()
+
+	// if no domains pulled from yaml, load from env
+	if len(model.Hosts) == 0 {
+		envHosts := cc.GetConfig(ConfigHosts)
+		model.Hosts = append(model.Hosts, strings.Split(envHosts, ",")...)
+	}
+	if model.Domain == "" {
+		model.Domain = cc.GetConfig(ConfigDomain)
+	}
+	if model.Email == "" {
+		model.Email = cc.GetConfig(ConfigEmail)
+	}
+	if model.Token == "" {
+		model.Token = cc.GetConfig(ConfigToken)
+	}
+
+	return model
+}
+
 func (cc *ConfigClient) GetConfig(key string) string {
 	res, filled := os.LookupEnv(key)
 	if !filled {
@@ -69,4 +107,34 @@ func loadEnvFile() {
 	if err != nil {
 		log.Fatalln(err)
 	}
-}
+}
+
+func (cc *ConfigClient) IsConfigInCurrentDirectory(fileName string) error {
+	_, err := os.Stat(fileName)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func LoadYaml(yamlFile string) (ConfigModel, error) {
+	var results = ConfigModel{}
+
+	// check for the config in the current directory
+	_, err := os.Stat(yamlFile)
+	if err != nil {
+		return ConfigModel{}, err
+	}
+
+	content, err := os.ReadFile(yamlFile)
+	if err != nil {
+		return ConfigModel{}, err
+	}
+
+	err = yaml.Unmarshal(content, &results)
+	if err != nil {
+		return ConfigModel{}, err
+	}
+
+	return results, nil
+}

cron.go

@@ -7,7 +7,7 @@ import (
 	"github.com/robfig/cron/v3"
 )
 
-type cronClient struct{
+type cronClient struct {
 	scheduler *cron.Cron
 }
 
@@ -37,17 +37,18 @@ func (c cronClient) RunCloudflareCheck(ApiToken string, Email string, Domain str
 		log.Println(err)
 		return
 	}
-	
+
 	for _, host := range Hosts {
 		hostname := fmt.Sprintf("%v.%v", host, Domain)
 		log.Printf("Reviewing '%v'", hostname)
 		dns, err := cf.GetDnsEntriesByDomain(domainDetails.Result[0].ID, host, Domain)
 		if err != nil {
 			log.Println("failed to collect dns entry")
-			return 
+			return
 		}
-		
+
-		if dns.Result[0].Content != currentIp {
+		var result = dns.Result[0]
+		if result.Content != currentIp {
 			log.Println("IP Address no longer matches, sending an update")
 			err = cf.UpdateDnsEntry(domainDetails.Result[0].ID, dns, currentIp)
 			if err != nil {
@@ -56,4 +57,8 @@ func (c cronClient) RunCloudflareCheck(ApiToken string, Email string, Domain str
 		}
 	}
 	log.Println("Done!")
-}
+}
+
+func (c cronClient) HelloWorldJob() {
+	log.Print("Hello World")
+}

go.mod

@@ -6,3 +6,5 @@ require (
 	github.com/joho/godotenv v1.4.0
 	github.com/robfig/cron/v3 v3.0.1
 )
+
+require gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -2,3 +2,6 @@ github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
 github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -5,16 +5,15 @@ import (
 	"io"
 	"log"
 	"net/http"
-	"strings"
 	"time"
 )
 
 var (
-	ErrInvalidStatusCode error = errors.New("did not get an acceptiable status code from the server")
+	ErrInvalidStatusCode  error = errors.New("did not get an acceptiable status code from the server")
 	ErrFailedToDecodeBody error = errors.New("unable to decode the body")
 	ErrFailedToDecodeJson error = errors.New("unexpected json format was returned")
-	ErrWasNotJson error = errors.New("response from server was not json")
+	ErrWasNotJson         error = errors.New("response from server was not json")
-	ErrDomainNotFound error = errors.New("unable to find requested domain on cloudflare")
+	ErrDomainNotFound     error = errors.New("unable to find requested domain on cloudflare")
 )
 
 func GetCurrentIpAddress() (string, error) {
@@ -38,33 +37,36 @@ func GetCurrentIpAddress() (string, error) {
 
 func main() {
 	config := NewConfigClient()
-	email := config.GetConfig(ConfigEmail)
+	cfg := config.LoadConfig()
-	if email == "" {
+
+	if cfg.Email == "" {
 		log.Println("Unable to find 'EMAIL' env value.")
 		return
 	}
 
-	token := config.GetConfig(ConfigToken)
+	if cfg.Token == "" {
-	if token == "" {
 		log.Println("Unable to find 'API_TOKEN' env value.")
+		return
 	}
 
-	domain := config.GetConfig(ConfigDomain)
+	if cfg.Domain == "" {
-	if token == "" {
 		log.Println("Unable to find 'DOMAIN' env value.")
+		return
 	}
 
-	hosts := config.GetConfig(ConfigHosts)
+	if len(cfg.Hosts) == 0 {
-	if token == "" {
 		log.Println("Unable to find 'HOSTS' env value.")
 	}
-	hostsArray := strings.Split(hosts, ",")
+
-	log.Println("Env Check: OK")
+	log.Println("Config Check: OK")
 
 	cron := NewCron()
 	log.Println("Cloudflare Check will run every 15 minutes.")
-	cron.scheduler.AddFunc("0,15,30,45 * * * *", func() { 
+	cron.scheduler.AddFunc("0/5 * * * *", func() {
-		cron.RunCloudflareCheck(token, email, domain, hostsArray)
+		cron.RunCloudflareCheck(cfg.Token, cfg.Email, cfg.Domain, cfg.Hosts)
+	})
+	cron.scheduler.AddFunc("0/1 * * * *", func() {
+		cron.HelloWorldJob()
 	})
 	cron.scheduler.Start()
 
@@ -74,4 +76,3 @@ func main() {
 	}
 
 }
-