Store the ascii title in a file for cleanliness

Dockerfile

@@ -1,12 +1,18 @@
-FROM golang:1.22
+FROM golang:1.23 AS compile
 
 WORKDIR /usr/src/app
 
-# pre-copy/cache go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
-# COPY go.mod go.sum ./
-# RUN go mod download && go mod verify
-
 COPY . .
-RUN go build -v -o /usr/local/bin/app ./...
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /app ./...
 
-CMD ["app"]
+FROM alpine:latest AS compressor
+RUN apk add --no-cache upx
+COPY --from=compile /app /app
+RUN upx --best /app
+
+FROM scratch AS service
+
+COPY --from=compile /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=compressor /app .
+
+ENTRYPOINT ["/app"]

README.md

@@ -1,6 +1,13 @@
 # Dynamic DNS Updates with Cloudflare
 
-![cloudflare-dynamic-dns](https://github.com/mxmlndml/cloudflare-dynamic-dns/assets/42516330/d1faa020-e730-4f53-9706-4fe9e9a7bd41)
+> [!NOTE]
+> This program was originally written by [mxmlndml]. This fork merely
+> optimizes the docker image with better (more optimized) compiles flags
+> and strips out the entire Go runtime from the final image (making the final
+> image <3MB instead of ~900MB). Go thank him for his work developing this, not
+> me ;)
+
+![cloudflare-dynamic-dns](https://github.com/mxmlndml/cloudflare-dynamic-dns/assets/42516330/fc6e7c3e-eb96-4fdf-924e-cf86dab70b4b)
 
 This Docker container offers a straightforward and efficient solution for
 automating dynamic DNS updates using the Cloudflare DNS service. It empowers you
@@ -24,11 +31,11 @@ pulling the pre-built Docker container and running it with the necessary
 environment variables
 
 ```sh
-docker run -d -e API_KEY=123 -e ZONE_ID=023e105f4ecef8ad9ca31a8372d0c353 -e DOMAIN_NAMES=dyndns.example.com,example.com --restart=always mxmlndml/cloudflare-dynamic-dns
+docker run -d -e API_KEY=123 -e ZONE_ID=023e105f4ecef8ad9ca31a8372d0c353 -e DOMAIN_NAMES=example.com,*.example.com chaussebenjamin/cloudflare-dynamic-dns
 ```
 
-Alternatively you can copy the `docker-compose.yml` from this repository into an
+Alternatively you can copy the `docker-compose.yml` and `.env.template` from this repository into an
-empty directory of your machine, edit the environment variables and start the
+empty directory of your machine, rename the `.env.template` to `.env`, edit the environment variables in both files and start the
 container with `docker compose`
 
 ```sh
@@ -52,9 +59,17 @@ breakdown of the available configuration variables:
   \
   List of DNS A records that should store your public IP address delimited by a
   comma (and only a comma)
+- **`RECORD_TYPES`** _defaults to `A`_
+  \
+  Whether A and/or AAAA records should be updated
+  \
+  `A`: updates only A records
+  \
+  `AAAA`: updates only AAAA records
+  \
+  `*`: updates both A and AAAA records
 - **`INTERVAL`** _defaults to `5`_
   \
   Time interval in minutes between DNS updates
-- **`LOG_LEVEL`** _defaults to `INFO`_
+
-  \
+[1]: github.com/mxmlndml/cloudflare-dynamic-dns
-  Logging level for the container, either `DEBUG`, `INFO`, `WARN` or `ERROR`

cloudflare.go

@@ -8,39 +8,6 @@ import (
 	"net/http"
 )
 
-func setAuthHeader(req *http.Request, apiKey string) {
-	authHeader := fmt.Sprint("bearer ", apiKey)
-	req.Header.Add("Authorization", authHeader)
-}
-
-type cloudflareResponse struct {
-	Success bool
-	Result  []struct {
-		ID      string
-		Content string
-		Type    string
-	}
-	Errors []struct {
-		Message string
-	}
-}
-
-func checkServerErrors(data *cloudflareResponse) {
-	if data.Success {
-		return
-	}
-
-	msg := ""
-	for i, err := range data.Errors {
-		if i != 0 {
-			msg += ", "
-		}
-		msg += err.Message
-	}
-
-	log.Panic("Server responded with error: ", msg)
-}
-
 type dnsRecord struct {
 	id      string
 	content string
@@ -51,6 +18,11 @@ type DNSRecords struct {
 	aaaa dnsRecord
 }
 
+func setAuthHeader(req *http.Request, apiKey string) {
+	authHeader := fmt.Sprint("bearer ", apiKey)
+	req.Header.Add("Authorization", authHeader)
+}
+
 func GetDNSRecord(zoneID string, domainName string, apiKey string) DNSRecords {
 	dnsRecords := DNSRecords{
 		name: domainName,
@@ -71,12 +43,32 @@ func GetDNSRecord(zoneID string, domainName string, apiKey string) DNSRecords {
 
 	defer resp.Body.Close()
 
-	var data cloudflareResponse
+	var data struct {
+		Success bool
+		Errors  []struct {
+			Message string
+		}
+		Result []struct {
+			ID      string
+			Content string
+			Type    string
+		}
+	}
 	err = json.NewDecoder(resp.Body).Decode(&data)
 	if err != nil {
 		log.Panic("Error parsing JSON: ", err)
 	}
-	checkServerErrors(&data)
+	if !data.Success {
+		msg := ""
+		for i, err := range data.Errors {
+			if i != 0 {
+				msg += ", "
+			}
+			msg += err.Message
+		}
+
+		log.Panic("Server responded with error: ", msg)
+	}
 
 	for _, record := range data.Result {
 		switch record.Type {
@@ -125,10 +117,25 @@ func UpdateDNSRecord(zoneID string, dnsRecordID string, apiKey string, body DNSR
 
 	defer resp.Body.Close()
 
-	var data cloudflareResponse
+	var data struct {
+		Success bool
+		Errors  []struct {
+			Message string
+		}
+	}
 	err = json.NewDecoder(resp.Body).Decode(&data)
 	if err != nil {
 		log.Fatal("Error parsing JSON: ", err)
 	}
-	checkServerErrors(&data)
+
+	if !data.Success {
+		msg := ""
+		for i, err := range data.Errors {
+			if i != 0 {
+				msg += ", "
+			}
+			msg += err.Message
+		}
+		log.Panic("Server responded with error: ", msg)
+	}
 }

docker-compose.yml

@@ -1,9 +1,10 @@
+---
 services:
   cloudflare-dynamic-dns:
-    image: mxmlndml/cloudflare-dynamic-dns:latest
+    image: chaussebenjamin/cloudflare-dynamic-dns:latest
     environment:
-      - "API_KEY=${API_KEY}"
+      - API_KEY=${API_KEY}
-      - "ZONE_ID=${ZONE_ID}"
+      - ZONE_ID=${ZONE_ID}
-      - "DOMAIN_NAMES=example.com,dyndns.example.com"
+      - DOMAIN_NAMES=example.com,dyndns.example.com
       # - "RECORD_TYPES=A"
       # - "INTERVAL=5"

main.go

@@ -1,11 +1,17 @@
 package main
 
 import (
+	_ "embed"
+	"fmt"
 	"log"
+	"strings"
 	"sync"
 	"time"
 )
 
+//go:embed title.txt
+var appNameASCII string
+
 type publicIP struct {
 	v4 string
 	v6 string
@@ -57,7 +63,28 @@ func getDNSRecords() []DNSRecords {
 	return dnsRecords
 }
 
+func initialize() {
+	fmt.Print(appNameASCII)
+
+	var recordType string
+	if UseIPv4() && UseIPv6() {
+		recordType = "A and AAAA"
+	} else if UseIPv4() {
+		recordType = "A"
+	} else if UseIPv6() {
+		recordType = "AAAA"
+	}
+
+	domainNames := strings.Join(GetDomainNames(), ", ")
+
+	interval := GetInterval()
+
+	fmt.Printf("Updating %v records of %v every %v minutes\n\n", recordType, domainNames, interval)
+}
+
 func main() {
+	initialize()
+
 	for {
 		var publicIP publicIP
 		var dnsRecords []DNSRecords
@@ -84,7 +111,7 @@ func main() {
 
 				go func() {
 					UpdateDNSRecord(zoneID, dnsRecord.a.id, apiKey, DNSRecordBody{Type: "A", Name: dnsRecord.name, Content: publicIP.v4})
-					log.Printf("Set DNS record %v to %v", dnsRecord.name, publicIP.v4)
+					log.Printf("Set DNS A record %v to %v", dnsRecord.name, publicIP.v4)
 					wg.Done()
 				}()
 			}
@@ -93,7 +120,7 @@ func main() {
 
 				go func() {
 					UpdateDNSRecord(zoneID, dnsRecord.aaaa.id, apiKey, DNSRecordBody{Type: "AAAA", Name: dnsRecord.name, Content: publicIP.v6})
-					log.Printf("Set DNS record %v to %v", dnsRecord.name, publicIP.v6)
+					log.Printf("Set DNS AAAA record %v to %v", dnsRecord.name, publicIP.v6)
 					wg.Done()
 				}()
 			}

title.txt

@@ -0,0 +1,5 @@
+	  _______             _______               ___                       _       ___  _  ______
+	 / ___/ /__  __ _____/ / _/ /__ ________   / _ \__ _____  ___ ___ _  (_)___  / _ \/ |/ / __/
+	/ /__/ / _ \/ // / _  / _/ / _ `/ __/ -_) / // / // / _ \/ _ `/  ' \/ / __/ / // /    /\ \
+	\___/_/\___/\_,_/\_,_/_//_/\_,_/_/  \__/ /____/\_, /_//_/\_,_/_/_/_/_/\__/ /____/_/|_/___/
+	                                              /___/