Skip to content

Commit 6210ed9

Browse files
authored
feat: add docker builder use nix (FloatTech#911)
* fix(typo): no -> not * fix: update version * feat: use nix to build docker image * feat: ignore nix result * fix(nix docker builder): failed to verify certificate
1 parent a29b116 commit 6210ed9

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ zerobot
99
ZeroBot-Plugin*
1010
*.syso
1111
/.direnv
12+
/result

default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
}:
1515
buildGoApplication {
1616
pname = "ZeroBot-Plugin";
17-
version = "1.7.6";
17+
version = "1.8.0";
1818
pwd = ./.;
1919
src = ./.;
2020
# spec go version manually bcs
2121
# https://github.com/nix-community/gomod2nix/blob/30e3c3a9ec4ac8453282ca7f67fca9e1da12c3e6/builder/default.nix#L130
22-
# do no work
22+
# do not work
2323
go = pkgs.go_1_20;
2424
modules = ./gomod2nix.toml;
2525
}

flake.nix

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,26 @@
2222
callPackage = pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage;
2323
in {
2424
# doCheck will fail at write files
25-
packages.default =
26-
(callPackage ./. {
27-
inherit (gomod2nix.legacyPackages.${system}) buildGoApplication;
28-
})
29-
.overrideAttrs (_: {doCheck = false;});
25+
packages = rec {
26+
27+
ZeroBot-Plugin =
28+
(callPackage ./. {
29+
inherit (gomod2nix.legacyPackages.${system}) buildGoApplication;
30+
})
31+
.overrideAttrs (_: {doCheck = false;});
32+
33+
default = ZeroBot-Plugin;
34+
35+
docker_builder = pkgs.dockerTools.buildLayeredImage {
36+
name = "ZeroBot-Plugin";
37+
tag = "latest";
38+
contents = [
39+
self.packages.${system}.ZeroBot-Plugin
40+
pkgs.cacert
41+
];
42+
};
43+
44+
};
3045
devShells.default = callPackage ./shell.nix {
3146
inherit (gomod2nix.legacyPackages.${system}) mkGoEnv gomod2nix;
3247
};

0 commit comments

Comments
 (0)