From 2bd953dcb6b5e6d71de76fbbb1168365c5ba8e43 Mon Sep 17 00:00:00 2001
From: juls0730 <62722391+juls0730@users.noreply.github.com>
Date: Sat, 14 Dec 2024 03:13:16 -0600
Subject: [PATCH] fix dockerfile

---
 Dockerfile       | 17 +++++++++++------
 README.md        | 10 ++++------
 server/server.go |  4 ++++
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ce01a27..85e08f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-bookworm as builder
+FROM golang:1.23-bookworm AS builder
 
 WORKDIR /app
 
@@ -8,13 +8,18 @@ RUN go mod download
 
 COPY . .
 
-RUN GOOS=linux go build -o fluxd cmd/fluxd/main.go
+RUN CGO_ENABLED=1 GOOS=linux go build -o fluxd ./cmd/fluxd/main.go
+
+FROM golang:1.23-bookworm
 
 RUN (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.36.0/pack-v0.36.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack)
-RUN apt-get install -y ca-certificates
+
+COPY --from=builder /app/fluxd /usr/local/bin/fluxd
+
+ENV PATH="/usr/local/bin:${PATH}"
+
+VOLUME ["/var/run/docker.sock"]
 
 EXPOSE 5647 7465
 
-VOLUME [ "/var/run/docker.sock" ]
-
-CMD ["/app/fluxd"]
+ENTRYPOINT ["fluxd"]
\ No newline at end of file
diff --git a/README.md b/README.md
index 0a5b559..ad99d0c 100644
--- a/README.md
+++ b/README.md
@@ -58,22 +58,20 @@ cd flux
 zqdgr build:daemon
 sudo mv fluxd /usr/local/bin/
 
-sudo cat <<EOF > /etc/systemd/system/fluxd.service
+cat <<EOF
 [Unit]
 Description=Flux Daemon
 After=network.target
 
 [Service]
 ExecStart=/usr/local/bin/fluxd
-WorkingDirectory=/var/fluxd
-User=fluxuser
-Group=fluxgroup
 Restart=always
-Environment=FLUXD_ROOT_DIR=/var/fluxd
+Environment=GOPATH=/var/fluxd/go
+Environment=HOME=/var/fluxd/home
 
 [Install]
 WantedBy=multi-user.target
-EOF
+EOF | sudo tee /etc/systemd/system/fluxd.service
 
 sudo systemctl daemon-reload
 sudo systemctl enable --now fluxd
diff --git a/server/server.go b/server/server.go
index 641c733..d877179 100644
--- a/server/server.go
+++ b/server/server.go
@@ -63,6 +63,10 @@ func NewFluxServer() *FluxServer {
 		rootDir = "/var/fluxd"
 	}
 
+	if err := os.MkdirAll(rootDir, 0755); err != nil {
+		logger.Fatalw("Failed to create fluxd directory", zap.Error(err))
+	}
+
 	db, err := sql.Open("sqlite3", filepath.Join(rootDir, "fluxd.db"))
 	if err != nil {
 		logger.Fatalw("Failed to open database", zap.Error(err))