fix dockerfile

This commit is contained in:
Zoe
2024-12-14 03:13:16 -06:00
parent de22bd20c9
commit 2bd953dcb6
3 changed files with 19 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
FROM golang:1.23-bookworm as builder FROM golang:1.23-bookworm AS builder
WORKDIR /app WORKDIR /app
@@ -8,13 +8,18 @@ RUN go mod download
COPY . . 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 (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
EXPOSE 5647 7465 COPY --from=builder /app/fluxd /usr/local/bin/fluxd
ENV PATH="/usr/local/bin:${PATH}"
VOLUME ["/var/run/docker.sock"] VOLUME ["/var/run/docker.sock"]
CMD ["/app/fluxd"] EXPOSE 5647 7465
ENTRYPOINT ["fluxd"]

View File

@@ -58,22 +58,20 @@ cd flux
zqdgr build:daemon zqdgr build:daemon
sudo mv fluxd /usr/local/bin/ sudo mv fluxd /usr/local/bin/
sudo cat <<EOF > /etc/systemd/system/fluxd.service cat <<EOF
[Unit] [Unit]
Description=Flux Daemon Description=Flux Daemon
After=network.target After=network.target
[Service] [Service]
ExecStart=/usr/local/bin/fluxd ExecStart=/usr/local/bin/fluxd
WorkingDirectory=/var/fluxd
User=fluxuser
Group=fluxgroup
Restart=always Restart=always
Environment=FLUXD_ROOT_DIR=/var/fluxd Environment=GOPATH=/var/fluxd/go
Environment=HOME=/var/fluxd/home
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
EOF EOF | sudo tee /etc/systemd/system/fluxd.service
sudo systemctl daemon-reload sudo systemctl daemon-reload
sudo systemctl enable --now fluxd sudo systemctl enable --now fluxd

View File

@@ -63,6 +63,10 @@ func NewFluxServer() *FluxServer {
rootDir = "/var/fluxd" 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")) db, err := sql.Open("sqlite3", filepath.Join(rootDir, "fluxd.db"))
if err != nil { if err != nil {
logger.Fatalw("Failed to open database", zap.Error(err)) logger.Fatalw("Failed to open database", zap.Error(err))