From 281043f96fd9802e47fb198146abdb6319806760 Mon Sep 17 00:00:00 2001 From: yuzu Date: Tue, 6 May 2025 00:17:10 -0500 Subject: [PATCH] minor tweaks --- Dockerfile | 4 ++-- build.zig | 12 +++++++++--- src/app/views/login.zig | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ddb96fd..81ed671 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:latest AS build RUN apk add jq curl tar xz git vim -RUN curl --output /zig.tar.xz "$(curl -s 'https://ziglang.org/download/index.json' | jq -r '.master."x86_64-linux".tarball')" +RUN curl --output /zig.tar.xz "$(curl -s 'https://ziglang.org/download/index.json' | jq -r '.master."aarch64-linux".tarball')" RUN mkdir /zig WORKDIR /zig @@ -13,7 +13,7 @@ RUN /zig/zig-*/zig build -Denvironment=production install run mkdir /jetzig WORKDIR /jetzig -RUN git clone https://github.com/jetzig-framework/jetzig . +RUN git clone https://github.com/yuzudev/jetzig . WORKDIR ./cli RUN /zig/zig-*/zig build install diff --git a/build.zig b/build.zig index 30b027b..98f3e20 100644 --- a/build.zig +++ b/build.zig @@ -3,17 +3,21 @@ const jetzig = @import("jetzig"); pub fn build(b: *std.Build) !void { const target = b.standardTargetOptions(.{}); - const optimize = b.standardOptimizeOption(.{}); + const optimize = .ReleaseSafe; const exe = b.addExecutable(.{ .name = "yuzucchiidotxyz", .root_source_file = b.path("src/main.zig"), .target = target, .optimize = optimize, + .use_llvm = true // fix for my arm machine }); const options = b.addOptions(); - options.addOption([]const u8, "BLOGS_PASSWORD", "admin"); + + options.addOption([]const u8, "BLOGS_PASSWORD", std.posix.getenv("BLOGS_PASSWORD") orelse "admin"); + + options.addOption([]const u8, "DOMAIN", std.posix.getenv("DOMAIN") orelse "localhost"); exe.root_module.addOptions("dev", options); @@ -26,7 +30,9 @@ pub fn build(b: *std.Build) !void { exe.root_module.addImport("uuid", uuid.module("uuid")); // ^ Add all dependencies before `jetzig.jetzigInit()` ^ - try jetzig.jetzigInit(b, exe, .{}); + try jetzig.jetzigInit(b, exe, .{ + .zmpl_version = .v2 + }); b.installArtifact(exe); diff --git a/src/app/views/login.zig b/src/app/views/login.zig index eb3b03a..97d30eb 100644 --- a/src/app/views/login.zig +++ b/src/app/views/login.zig @@ -42,6 +42,7 @@ pub fn post(request: *jetzig.Request) !jetzig.View { .name = "session", .value = uuid, .path = "/", + .domain = @import("dev").DOMAIN, .http_only = true, .secure = false, .max_age = 60 * 60 * 24 * 7, // 1 week