From dad860bc3aeb6bc920f567d137832a811192b93c Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sat, 22 Jan 2022 17:00:46 -0800 Subject: [PATCH] remove -zig suffix from app since it doesnt conflict with go one --- Dockerfile | 2 +- build.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c8f579..1dacc98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN zig build -Dversion=r${RELEASE_NUM} -Drelease FROM alpine COPY --from=golang /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=golang /app/zig-out/bin/aquila-zig /app/aquila +COPY --from=golang /app/zig-out/bin/aquila /app/aquila RUN apk add git VOLUME /data diff --git a/build.zig b/build.zig index 776fd80..021a7a9 100644 --- a/build.zig +++ b/build.zig @@ -12,7 +12,7 @@ pub fn build(b: *std.build.Builder) void { const use_full_name = b.option(bool, "use-full-name", "") orelse false; const with_os_arch = b.fmt("-{s}-{s}", .{ @tagName(target.os_tag orelse builtin.os.tag), @tagName(target.cpu_arch orelse builtin.cpu.arch) }); - const exe_name = b.fmt("{s}{s}", .{ "aquila-zig", if (use_full_name) with_os_arch else "" }); + const exe_name = b.fmt("{s}{s}", .{ "aquila", if (use_full_name) with_os_arch else "" }); const exe = b.addExecutable(exe_name, "src/main.zig"); exe.setTarget(target);