Merge pull request 'Changed things around. Should fix docker compilation' (#1) from daanselen/fibonacci:build into build

Reviewed-on: #1

.gitea/workflows/container.yaml

@@ -18,5 +18,6 @@ jobs:
           go-version: '1.24.4'
           check-latest: true
       - name: Containerize app
-        run: exit 0
+        run: |
-       
+          echo "Still needs to be implemented."
+          exit 1       

.gitea/workflows/unit-tests.yaml

@@ -18,5 +18,7 @@ jobs:
           check-latest: true
       - name: Test functions module
         run: go test ./functions -v
+        working-directory: ./code
       - name: Test actual build
         run: go build
+        working-directory: ./code

.gitignore

@@ -1,26 +1,3 @@
-# Allowlisting gitignore template for GO projects prevents us
-# from adding various unwanted local files, such as generated
-# files, developer configurations or IDE-specific files etc.
-#
-# Recommended: Go.AllowList.gitignore
-
-# Ignore everything
-*
 
 .env
-# But not these files...
+.swp
-!/.gitignore
-
-!*.go
-!go.sum
-!go.mod
-
-!README.md
-!LICENSE
-
-# !Makefile
-
-# ...even if they are in subdirectories
-!*/
-!.gitea/*
-!.gitea/workflows/*

code/.gitignore

@@ -0,0 +1,16 @@
+# Allowlisting gitignore template for GO projects prevents us
+# from adding various unwanted local files, such as generated
+# files, developer configurations or IDE-specific files etc.
+#
+# Recommended: Go.AllowList.gitignore
+
+# Ignore everything
+*
+
+.env
+# But not these files...
+!/.gitignore
+
+!*.go
+!go.sum
+!go.mod

code/go.mod

@@ -1,4 +1,5 @@
 module darjeeling.systemec.nl/rhouben/fibonacci
+replace darjeeling.systemec.nl/rhouben/fibonacci/functions => ./functions
 
 go 1.24.4
 

code/main.go

@@ -1,11 +1,11 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"net/http"
 	"os"
 	"strconv"
-        "flag"
 
 	"github.com/joho/godotenv"
 
@@ -24,7 +24,7 @@ func main() {
 	}
 	port_arg := os.Getenv("FIB_PORT")
 	if port_arg != "" {
-		fmt.Printf("Loaded port value '%s' from environment.\n",port_arg)
+		fmt.Printf("Loaded port value '%s' from environment.\n", port_arg)
 		port_number, error = strconv.Atoi(port_arg)
 		if error != nil {
 			fmt.Printf("I had an error trying to parse '%s' into a number: %s\n",
@@ -33,9 +33,9 @@ func main() {
 			os.Exit(0)
 		}
 	}
-	flag.IntVar(&port, "port", 8098, 
+	flag.IntVar(&port, "port", 8098,
 		fmt.Sprintf("Port number to bind to, default %d", port_number))
-	flag.IntVar(&seq, "number", 0, 
+	flag.IntVar(&seq, "number", 0,
 		"Fibonacci sequence value to calculate")
 	flag.Parse()
 

docker/Dockerfile

@@ -0,0 +1,19 @@
+FROM golang:1.24-bookworm AS base
+
+# /build is the working directory
+WORKDIR /build
+
+# Copy control files and pull in dependencies
+COPY code/ ./
+RUN go mod tidy \
+  && go mod download
+
+ENV port=8089
+
+# Build the app
+
+RUN go build -o fibonacci
+
+EXPOSE ${port}
+
+CMD ["build/fibonacci"]