From 0d3ece6b56abc5c8fe8bf64aa4380fcdc1cc8691 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 22 Nov 2022 10:33:56 +0100 Subject: [PATCH 01/44] add toc --- Dockerfile | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) create mode 100644 Dockerfile create mode 100644 README.md diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..790c4e3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM alpine:3 as builder +RUN apk add --no-cache cargo +RUN cargo install mdbook +RUN cargo install mdbook-toc + +FROM alpine:3 +RUN apk add --no-cache libgcc +COPY --from=builder /root/.cargo/bin/mdbook /bin/mdbook +COPY --from=builder /root/.cargo/bin/mdbook-toc /bin/mdbook-toc diff --git a/README.md b/README.md new file mode 100644 index 0000000..0b98f26 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# mdbook Dockerfile From 5d0bcc9e1e71a3117b6784090e19f2fa622e43db Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Tue, 22 Nov 2022 10:33:56 +0100 Subject: [PATCH 02/44] add toc --- Dockerfile | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) create mode 100644 Dockerfile create mode 100644 README.md diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..790c4e3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM alpine:3 as builder +RUN apk add --no-cache cargo +RUN cargo install mdbook +RUN cargo install mdbook-toc + +FROM alpine:3 +RUN apk add --no-cache libgcc +COPY --from=builder /root/.cargo/bin/mdbook /bin/mdbook +COPY --from=builder /root/.cargo/bin/mdbook-toc /bin/mdbook-toc diff --git a/README.md b/README.md new file mode 100644 index 0000000..0b98f26 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# mdbook Dockerfile From a5df1afb0d2accc9d47bcbc4c1a4effe741940bd Mon Sep 17 00:00:00 2001 From: victor Date: Sun, 27 Nov 2022 21:55:46 +0100 Subject: [PATCH 03/44] testing flake-based container --- .gitignore | 1 + .woodpecker-ci.yml | 10 ++++++++++ Dockerfile | 9 --------- flake.lock | 43 +++++++++++++++++++++++++++++++++++++++++++ flake.nix | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 9 deletions(-) create mode 100644 .gitignore create mode 100644 .woodpecker-ci.yml delete mode 100644 Dockerfile create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e2f5dd2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result \ No newline at end of file diff --git a/.woodpecker-ci.yml b/.woodpecker-ci.yml new file mode 100644 index 0000000..8f003b0 --- /dev/null +++ b/.woodpecker-ci.yml @@ -0,0 +1,10 @@ +pipeline: + nix: + image: nixos/nix + commands: + - nix flake check + - nix build '.#mdbook-toc' + volumes: + - /nix/store:/nix/store + - /nix/var/nix/db:/nix/var/nix/db + - /nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 790c4e3..0000000 --- a/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM alpine:3 as builder -RUN apk add --no-cache cargo -RUN cargo install mdbook -RUN cargo install mdbook-toc - -FROM alpine:3 -RUN apk add --no-cache libgcc -COPY --from=builder /root/.cargo/bin/mdbook /bin/mdbook -COPY --from=builder /root/.cargo/bin/mdbook-toc /bin/mdbook-toc diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..c2b8881 --- /dev/null +++ b/flake.lock @@ -0,0 +1,43 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1669411043, + "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..2bd0e62 --- /dev/null +++ b/flake.nix @@ -0,0 +1,33 @@ +{ + description = "A very basic flake"; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in { + packages = rec { + docker = pkgs.dockerTools.buildLayeredImage { + name = "mdbook-plus"; + contents = mdbook-toc; + config.Cmd = [ "${pkgs.mdbook}/bin/mdbook" ]; + }; + mdbook-toc = pkgs.rustPlatform.buildRustPackage rec { + pname = "mdbook-toc"; + version = "0.10.0"; + + src = pkgs.fetchFromGitHub { + owner = "badboy"; + repo = pname; + rev = version; + sha256 = "sha256-/MPxuzqgWKyLP1fn/WoA2cKlV0TiVidt+YpNqY96sxE="; + }; + + cargoSha256 = "sha256-JFqkeea6o5Wzpe+2Fp+UYjBOh/e3vX1pZzCfxxfAYmU="; + }; + }; + }); +} From 2a8f4e3f18f96f48060d02a1fb1c7e92386a1f52 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sun, 27 Nov 2022 21:55:46 +0100 Subject: [PATCH 04/44] testing flake-based container --- .gitignore | 1 + .woodpecker-ci.yml | 10 ++++++++++ Dockerfile | 9 --------- flake.lock | 43 +++++++++++++++++++++++++++++++++++++++++++ flake.nix | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 9 deletions(-) create mode 100644 .gitignore create mode 100644 .woodpecker-ci.yml delete mode 100644 Dockerfile create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e2f5dd2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result \ No newline at end of file diff --git a/.woodpecker-ci.yml b/.woodpecker-ci.yml new file mode 100644 index 0000000..8f003b0 --- /dev/null +++ b/.woodpecker-ci.yml @@ -0,0 +1,10 @@ +pipeline: + nix: + image: nixos/nix + commands: + - nix flake check + - nix build '.#mdbook-toc' + volumes: + - /nix/store:/nix/store + - /nix/var/nix/db:/nix/var/nix/db + - /nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 790c4e3..0000000 --- a/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM alpine:3 as builder -RUN apk add --no-cache cargo -RUN cargo install mdbook -RUN cargo install mdbook-toc - -FROM alpine:3 -RUN apk add --no-cache libgcc -COPY --from=builder /root/.cargo/bin/mdbook /bin/mdbook -COPY --from=builder /root/.cargo/bin/mdbook-toc /bin/mdbook-toc diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..c2b8881 --- /dev/null +++ b/flake.lock @@ -0,0 +1,43 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1669411043, + "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..2bd0e62 --- /dev/null +++ b/flake.nix @@ -0,0 +1,33 @@ +{ + description = "A very basic flake"; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in { + packages = rec { + docker = pkgs.dockerTools.buildLayeredImage { + name = "mdbook-plus"; + contents = mdbook-toc; + config.Cmd = [ "${pkgs.mdbook}/bin/mdbook" ]; + }; + mdbook-toc = pkgs.rustPlatform.buildRustPackage rec { + pname = "mdbook-toc"; + version = "0.10.0"; + + src = pkgs.fetchFromGitHub { + owner = "badboy"; + repo = pname; + rev = version; + sha256 = "sha256-/MPxuzqgWKyLP1fn/WoA2cKlV0TiVidt+YpNqY96sxE="; + }; + + cargoSha256 = "sha256-JFqkeea6o5Wzpe+2Fp+UYjBOh/e3vX1pZzCfxxfAYmU="; + }; + }; + }); +} From f6668bfb3b62ff92b5635d2cc54ede12898009b4 Mon Sep 17 00:00:00 2001 From: victor Date: Sun, 27 Nov 2022 21:56:39 +0100 Subject: [PATCH 05/44] fix name --- .woodpecker-ci.yml => .woodpecker.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .woodpecker-ci.yml => .woodpecker.yml (100%) diff --git a/.woodpecker-ci.yml b/.woodpecker.yml similarity index 100% rename from .woodpecker-ci.yml rename to .woodpecker.yml From d3457d37ce4166ad36e8740a48df2b9b61011396 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sun, 27 Nov 2022 21:56:39 +0100 Subject: [PATCH 06/44] fix name --- .woodpecker-ci.yml => .woodpecker.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .woodpecker-ci.yml => .woodpecker.yml (100%) diff --git a/.woodpecker-ci.yml b/.woodpecker.yml similarity index 100% rename from .woodpecker-ci.yml rename to .woodpecker.yml From aa203f2ce65c73c1f66c22c1b0ff0d40f2f36a46 Mon Sep 17 00:00:00 2001 From: victor Date: Sun, 27 Nov 2022 21:58:01 +0100 Subject: [PATCH 07/44] remove mounts --- .woodpecker.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 8f003b0..807fab9 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -4,7 +4,3 @@ pipeline: commands: - nix flake check - nix build '.#mdbook-toc' - volumes: - - /nix/store:/nix/store - - /nix/var/nix/db:/nix/var/nix/db - - /nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket From 248d64a599ca9e8ea26358f9cf50932b28d0327d Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sun, 27 Nov 2022 21:58:01 +0100 Subject: [PATCH 08/44] remove mounts --- .woodpecker.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 8f003b0..807fab9 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -4,7 +4,3 @@ pipeline: commands: - nix flake check - nix build '.#mdbook-toc' - volumes: - - /nix/store:/nix/store - - /nix/var/nix/db:/nix/var/nix/db - - /nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket From 4353ea5a2a0886ab395fbc17c98a6792653f9c4b Mon Sep 17 00:00:00 2001 From: victor Date: Sun, 27 Nov 2022 22:00:46 +0100 Subject: [PATCH 09/44] enable flakes --- .woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 807fab9..3c7fbb2 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,8 @@ pipeline: nix: image: nixos/nix + environment: + - NIX_CONFIG="experimental-features = nix-command flakes" commands: - nix flake check - nix build '.#mdbook-toc' From 5dad5221129cbdf8c7f7ca5b3507da9ad2a3430f Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sun, 27 Nov 2022 22:00:46 +0100 Subject: [PATCH 10/44] enable flakes --- .woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 807fab9..3c7fbb2 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,8 @@ pipeline: nix: image: nixos/nix + environment: + - NIX_CONFIG="experimental-features = nix-command flakes" commands: - nix flake check - nix build '.#mdbook-toc' From 6c9a81bd1884541c8458cbff6fa2514955bfa66a Mon Sep 17 00:00:00 2001 From: victor Date: Sun, 27 Nov 2022 22:01:16 +0100 Subject: [PATCH 11/44] enable flakes --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 3c7fbb2..cfe7a76 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,7 +2,7 @@ pipeline: nix: image: nixos/nix environment: - - NIX_CONFIG="experimental-features = nix-command flakes" + - NIX_CONFIG="extra-experimental-features = nix-command flakes" commands: - nix flake check - nix build '.#mdbook-toc' From d4dcb973470950e6a55b2f190bae8163b34900cb Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sun, 27 Nov 2022 22:01:16 +0100 Subject: [PATCH 12/44] enable flakes --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 3c7fbb2..cfe7a76 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,7 +2,7 @@ pipeline: nix: image: nixos/nix environment: - - NIX_CONFIG="experimental-features = nix-command flakes" + - NIX_CONFIG="extra-experimental-features = nix-command flakes" commands: - nix flake check - nix build '.#mdbook-toc' From af41c85b1f53041440f7336d9c367dcb1ebcfe47 Mon Sep 17 00:00:00 2001 From: victor Date: Sun, 27 Nov 2022 22:01:44 +0100 Subject: [PATCH 13/44] enable flakes --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index cfe7a76..8d2264b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,7 +2,7 @@ pipeline: nix: image: nixos/nix environment: - - NIX_CONFIG="extra-experimental-features = nix-command flakes" + - NIX_CONFIG=experimental-features = nix-command flakes commands: - nix flake check - nix build '.#mdbook-toc' From 24113d68bcd313b3fe7dc9d0c2c764f7b4bbbc47 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sun, 27 Nov 2022 22:01:44 +0100 Subject: [PATCH 14/44] enable flakes --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index cfe7a76..8d2264b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,7 +2,7 @@ pipeline: nix: image: nixos/nix environment: - - NIX_CONFIG="extra-experimental-features = nix-command flakes" + - NIX_CONFIG=experimental-features = nix-command flakes commands: - nix flake check - nix build '.#mdbook-toc' From ee4e3607993c9bccce08510a1f7f0ac4c4c88434 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Dec 2022 15:19:25 +0100 Subject: [PATCH 15/44] fully working docker image --- .woodpecker.yml | 2 ++ flake.nix | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 8d2264b..c958ae8 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,3 +6,5 @@ pipeline: commands: - nix flake check - nix build '.#mdbook-toc' + - nix build '.#docker' + diff --git a/flake.nix b/flake.nix index 2bd0e62..499dbc3 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,12 @@ packages = rec { docker = pkgs.dockerTools.buildLayeredImage { name = "mdbook-plus"; - contents = mdbook-toc; + contents = [ + (pkgs.buildEnv { + name = "mdbook-env"; + paths = with pkgs; [ busybox mdbook mdbook-toc ]; + }) + ]; config.Cmd = [ "${pkgs.mdbook}/bin/mdbook" ]; }; mdbook-toc = pkgs.rustPlatform.buildRustPackage rec { From d234c7e70cb4ac26860bd9f6e2db7438146421eb Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 3 Dec 2022 15:19:25 +0100 Subject: [PATCH 16/44] fully working docker image --- .woodpecker.yml | 2 ++ flake.nix | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 8d2264b..c958ae8 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,3 +6,5 @@ pipeline: commands: - nix flake check - nix build '.#mdbook-toc' + - nix build '.#docker' + diff --git a/flake.nix b/flake.nix index 2bd0e62..499dbc3 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,12 @@ packages = rec { docker = pkgs.dockerTools.buildLayeredImage { name = "mdbook-plus"; - contents = mdbook-toc; + contents = [ + (pkgs.buildEnv { + name = "mdbook-env"; + paths = with pkgs; [ busybox mdbook mdbook-toc ]; + }) + ]; config.Cmd = [ "${pkgs.mdbook}/bin/mdbook" ]; }; mdbook-toc = pkgs.rustPlatform.buildRustPackage rec { From 5bb96571b99601c650e03962603601715b886fac Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Dec 2022 15:24:15 +0100 Subject: [PATCH 17/44] fix flake --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 499dbc3..16bd187 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,8 @@ }; outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: + let inherit (flake-utils.lib) eachSystem system; + in eachSystem [ system.x86_64-linux ] (system: let pkgs = nixpkgs.legacyPackages.${system}; in { packages = rec { From 7931775d655a0cdc15413b260bd2d5c724f04c60 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 3 Dec 2022 15:24:15 +0100 Subject: [PATCH 18/44] fix flake --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 499dbc3..16bd187 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,8 @@ }; outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: + let inherit (flake-utils.lib) eachSystem system; + in eachSystem [ system.x86_64-linux ] (system: let pkgs = nixpkgs.legacyPackages.${system}; in { packages = rec { From 906a2b73efca48954db7cac4d9196d0d3819eacb Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Dec 2022 15:50:17 +0100 Subject: [PATCH 19/44] test ci build --- .woodpecker.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c958ae8..29a9562 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,4 +7,12 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' - + publish: + image: git.0x76.dev/v/push-container:0.1.0 + settings: + username: v + password: + from_secret: registry_password + repo: git.0x76.dev + image: git.0x76.dev/v/mdbook-dockerfile + tag: 0.1.0 From 3891382341354124a8322b5eb46f4110c4ba25e9 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 3 Dec 2022 15:50:17 +0100 Subject: [PATCH 20/44] test ci build --- .woodpecker.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c958ae8..29a9562 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,4 +7,12 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' - + publish: + image: git.0x76.dev/v/push-container:0.1.0 + settings: + username: v + password: + from_secret: registry_password + repo: git.0x76.dev + image: git.0x76.dev/v/mdbook-dockerfile + tag: 0.1.0 From 8662124be3ff5421b4762dbf2e4c3f27c52e63cf Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Dec 2022 15:59:06 +0100 Subject: [PATCH 21/44] ls files --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 29a9562..82dc3ae 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,6 +7,7 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' + - ls -la publish: image: git.0x76.dev/v/push-container:0.1.0 settings: From 762aede0247f56b99993b5df374c775b78635a55 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 3 Dec 2022 15:59:06 +0100 Subject: [PATCH 22/44] ls files --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 29a9562..82dc3ae 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,6 +7,7 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' + - ls -la publish: image: git.0x76.dev/v/push-container:0.1.0 settings: From 48305547058ce7861d66cb97b359d5b5477312ec Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Dec 2022 16:00:42 +0100 Subject: [PATCH 23/44] add workspace base --- .woodpecker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 82dc3ae..b249668 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,3 +1,6 @@ +workspace: + base: /mdbook + pipeline: nix: image: nixos/nix From 6b2bd5e1ffc2dfc8cdf28f6a8acf93b8677548ff Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 3 Dec 2022 16:00:42 +0100 Subject: [PATCH 24/44] add workspace base --- .woodpecker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 82dc3ae..b249668 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,3 +1,6 @@ +workspace: + base: /mdbook + pipeline: nix: image: nixos/nix From ada1a6729723e3643c34b64817ac257b8c1eead0 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Dec 2022 16:11:39 +0100 Subject: [PATCH 25/44] do a little dance --- .woodpecker.yml | 5 +++++ result.tar.gz | 1 + 2 files changed, 6 insertions(+) create mode 120000 result.tar.gz diff --git a/.woodpecker.yml b/.woodpecker.yml index b249668..2901fc6 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,6 +10,11 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' + - mv result result.tar.gz + - cp result.tar.gz result + debug: + image: nixos/nix + commands: - ls -la publish: image: git.0x76.dev/v/push-container:0.1.0 diff --git a/result.tar.gz b/result.tar.gz new file mode 120000 index 0000000..8e5e7fe --- /dev/null +++ b/result.tar.gz @@ -0,0 +1 @@ +/nix/store/3asb57pz1vf5vc0zhhj26clqyablchky-mdbook-plus.tar.gz \ No newline at end of file From 15dfed4a9f2c8c09ec799614173ac65464b50697 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 3 Dec 2022 16:11:39 +0100 Subject: [PATCH 26/44] do a little dance --- .woodpecker.yml | 5 +++++ result.tar.gz | 1 + 2 files changed, 6 insertions(+) create mode 120000 result.tar.gz diff --git a/.woodpecker.yml b/.woodpecker.yml index b249668..2901fc6 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,6 +10,11 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' + - mv result result.tar.gz + - cp result.tar.gz result + debug: + image: nixos/nix + commands: - ls -la publish: image: git.0x76.dev/v/push-container:0.1.0 diff --git a/result.tar.gz b/result.tar.gz new file mode 120000 index 0000000..8e5e7fe --- /dev/null +++ b/result.tar.gz @@ -0,0 +1 @@ +/nix/store/3asb57pz1vf5vc0zhhj26clqyablchky-mdbook-plus.tar.gz \ No newline at end of file From 2e11b8cda2e831e2051f5f873682aba55415bb28 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Dec 2022 16:51:45 +0100 Subject: [PATCH 27/44] improve ci hopefully --- .woodpecker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 2901fc6..311f81b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,18 +10,18 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' - - mv result result.tar.gz - - cp result.tar.gz result + # - mv result result.tar.gz + # - cp result.tar.gz result debug: image: nixos/nix commands: - ls -la publish: - image: git.0x76.dev/v/push-container:0.1.0 + image: git.0x76.dev/v/push-container:0.2.0 settings: username: v password: from_secret: registry_password repo: git.0x76.dev - image: git.0x76.dev/v/mdbook-dockerfile + image: v/mdbook-dockerfile tag: 0.1.0 From e8cfeb2bb13ac5f83a88ddb137a95d281ddf44ef Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 3 Dec 2022 16:51:45 +0100 Subject: [PATCH 28/44] improve ci hopefully --- .woodpecker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 2901fc6..311f81b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,18 +10,18 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' - - mv result result.tar.gz - - cp result.tar.gz result + # - mv result result.tar.gz + # - cp result.tar.gz result debug: image: nixos/nix commands: - ls -la publish: - image: git.0x76.dev/v/push-container:0.1.0 + image: git.0x76.dev/v/push-container:0.2.0 settings: username: v password: from_secret: registry_password repo: git.0x76.dev - image: git.0x76.dev/v/mdbook-dockerfile + image: v/mdbook-dockerfile tag: 0.1.0 From bc1183e2ce00217781836108f2d3db0db4633262 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Dec 2022 17:04:48 +0100 Subject: [PATCH 29/44] fix ci --- .woodpecker.yml | 9 ++------- flake.nix | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 311f81b..5369d84 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,12 +10,7 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' - # - mv result result.tar.gz - # - cp result.tar.gz result - debug: - image: nixos/nix - commands: - - ls -la + - cp result.tar.gz image.tar.gz publish: image: git.0x76.dev/v/push-container:0.2.0 settings: @@ -23,5 +18,5 @@ pipeline: password: from_secret: registry_password repo: git.0x76.dev - image: v/mdbook-dockerfile + image: v/mdbook-container tag: 0.1.0 diff --git a/flake.nix b/flake.nix index 16bd187..1e6a57f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "A very basic flake"; + description = "an container for mdbook with the toc plugin"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; @@ -12,7 +12,7 @@ in { packages = rec { docker = pkgs.dockerTools.buildLayeredImage { - name = "mdbook-plus"; + name = "mdbook-container"; contents = [ (pkgs.buildEnv { name = "mdbook-env"; From cbc004573b9b208c9bb5f49b0528338958651a46 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 3 Dec 2022 17:04:48 +0100 Subject: [PATCH 30/44] fix ci --- .woodpecker.yml | 9 ++------- flake.nix | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 311f81b..5369d84 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,12 +10,7 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' - # - mv result result.tar.gz - # - cp result.tar.gz result - debug: - image: nixos/nix - commands: - - ls -la + - cp result.tar.gz image.tar.gz publish: image: git.0x76.dev/v/push-container:0.2.0 settings: @@ -23,5 +18,5 @@ pipeline: password: from_secret: registry_password repo: git.0x76.dev - image: v/mdbook-dockerfile + image: v/mdbook-container tag: 0.1.0 diff --git a/flake.nix b/flake.nix index 16bd187..1e6a57f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "A very basic flake"; + description = "an container for mdbook with the toc plugin"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; @@ -12,7 +12,7 @@ in { packages = rec { docker = pkgs.dockerTools.buildLayeredImage { - name = "mdbook-plus"; + name = "mdbook-container"; contents = [ (pkgs.buildEnv { name = "mdbook-env"; From a56e126fda8793008dd63b5bac80c8a0dfb5dcc5 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Dec 2022 17:15:04 +0100 Subject: [PATCH 31/44] fix ci actually --- .woodpecker.yml | 2 +- result.tar.gz | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 result.tar.gz diff --git a/.woodpecker.yml b/.woodpecker.yml index 5369d84..1bf37b1 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,7 +10,7 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' - - cp result.tar.gz image.tar.gz + - cp result image.tar.gz publish: image: git.0x76.dev/v/push-container:0.2.0 settings: diff --git a/result.tar.gz b/result.tar.gz deleted file mode 120000 index 8e5e7fe..0000000 --- a/result.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/nix/store/3asb57pz1vf5vc0zhhj26clqyablchky-mdbook-plus.tar.gz \ No newline at end of file From fc8a8d1eb9080ae3a6fcf2557eae9578e39e1c26 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 3 Dec 2022 17:15:04 +0100 Subject: [PATCH 32/44] fix ci actually --- .woodpecker.yml | 2 +- result.tar.gz | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 result.tar.gz diff --git a/.woodpecker.yml b/.woodpecker.yml index 5369d84..1bf37b1 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,7 +10,7 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' - nix build '.#docker' - - cp result.tar.gz image.tar.gz + - cp result image.tar.gz publish: image: git.0x76.dev/v/push-container:0.2.0 settings: diff --git a/result.tar.gz b/result.tar.gz deleted file mode 120000 index 8e5e7fe..0000000 --- a/result.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/nix/store/3asb57pz1vf5vc0zhhj26clqyablchky-mdbook-plus.tar.gz \ No newline at end of file From ed41db9ab04624e13933aa36274e817a10d5aefa Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Dec 2022 17:26:54 +0100 Subject: [PATCH 33/44] update plugin --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1bf37b1..442f8ba 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,7 +12,7 @@ pipeline: - nix build '.#docker' - cp result image.tar.gz publish: - image: git.0x76.dev/v/push-container:0.2.0 + image: git.0x76.dev/v/push-container:0.3.0 settings: username: v password: From 33cfe3d56d0787bca5b32e71710d5da434f556b4 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 3 Dec 2022 17:26:54 +0100 Subject: [PATCH 34/44] update plugin --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1bf37b1..442f8ba 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,7 +12,7 @@ pipeline: - nix build '.#docker' - cp result image.tar.gz publish: - image: git.0x76.dev/v/push-container:0.2.0 + image: git.0x76.dev/v/push-container:0.3.0 settings: username: v password: From b313cbb7e40e57142b995b027220cf3893aec2c8 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 6 Dec 2022 07:55:25 +0100 Subject: [PATCH 35/44] update ci --- .woodpecker.yml | 9 ++------- flake.nix | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 442f8ba..bd77553 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,3 @@ -workspace: - base: /mdbook - pipeline: nix: image: nixos/nix @@ -9,14 +6,12 @@ pipeline: commands: - nix flake check - nix build '.#mdbook-toc' - - nix build '.#docker' - - cp result image.tar.gz publish: - image: git.0x76.dev/v/push-container:0.3.0 + image: git.0x76.dev/v/push-nix-container:main settings: username: v password: from_secret: registry_password + package: container # nix os package to build repo: git.0x76.dev image: v/mdbook-container - tag: 0.1.0 diff --git a/flake.nix b/flake.nix index 1e6a57f..6685dca 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ let pkgs = nixpkgs.legacyPackages.${system}; in { packages = rec { - docker = pkgs.dockerTools.buildLayeredImage { + container = pkgs.dockerTools.buildLayeredImage { name = "mdbook-container"; contents = [ (pkgs.buildEnv { From 5dfb3614e7d94e49c72745ef6bc41f8240062eda Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Tue, 6 Dec 2022 07:55:25 +0100 Subject: [PATCH 36/44] update ci --- .woodpecker.yml | 9 ++------- flake.nix | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 442f8ba..bd77553 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,3 @@ -workspace: - base: /mdbook - pipeline: nix: image: nixos/nix @@ -9,14 +6,12 @@ pipeline: commands: - nix flake check - nix build '.#mdbook-toc' - - nix build '.#docker' - - cp result image.tar.gz publish: - image: git.0x76.dev/v/push-container:0.3.0 + image: git.0x76.dev/v/push-nix-container:main settings: username: v password: from_secret: registry_password + package: container # nix os package to build repo: git.0x76.dev image: v/mdbook-container - tag: 0.1.0 diff --git a/flake.nix b/flake.nix index 1e6a57f..6685dca 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ let pkgs = nixpkgs.legacyPackages.${system}; in { packages = rec { - docker = pkgs.dockerTools.buildLayeredImage { + container = pkgs.dockerTools.buildLayeredImage { name = "mdbook-container"; contents = [ (pkgs.buildEnv { From c7ea20ddc41ad47fbb56478f2a26b1e7ebc9e900 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 6 Dec 2022 21:43:51 +0100 Subject: [PATCH 37/44] fix woodpecker --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index bd77553..3ea5953 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,7 +7,7 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' publish: - image: git.0x76.dev/v/push-nix-container:main + image: git.0x76.dev/v/push-nix-container:0.3.3 settings: username: v password: From c8889be612a970e560f78d4e00a09f1889ee37cb Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Tue, 6 Dec 2022 21:43:51 +0100 Subject: [PATCH 38/44] fix woodpecker --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index bd77553..3ea5953 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,7 +7,7 @@ pipeline: - nix flake check - nix build '.#mdbook-toc' publish: - image: git.0x76.dev/v/push-nix-container:main + image: git.0x76.dev/v/push-nix-container:0.3.3 settings: username: v password: From f4393f8791b885170ad0f36d1ad2bd9854adeb55 Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 18 Dec 2022 12:21:14 +0100 Subject: [PATCH 39/44] updated mdbook-toc to 0.11.0 --- flake.lock | 6 +++--- flake.nix | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c2b8881..34d547a 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669411043, - "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", + "lastModified": 1671200928, + "narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", + "rev": "757b82211463dd5ba1475b6851d3731dfe14d377", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6685dca..4701178 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,7 @@ let pkgs = nixpkgs.legacyPackages.${system}; in { packages = rec { + default = mdbook-toc; container = pkgs.dockerTools.buildLayeredImage { name = "mdbook-container"; contents = [ @@ -23,16 +24,16 @@ }; mdbook-toc = pkgs.rustPlatform.buildRustPackage rec { pname = "mdbook-toc"; - version = "0.10.0"; + version = "0.11.0"; src = pkgs.fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - sha256 = "sha256-/MPxuzqgWKyLP1fn/WoA2cKlV0TiVidt+YpNqY96sxE="; + sha256 = "sha256-ORJV2+Uh8GwXU+EWUQ2ls+AcplYbpYhl6hvCuFdKpTk="; }; - cargoSha256 = "sha256-JFqkeea6o5Wzpe+2Fp+UYjBOh/e3vX1pZzCfxxfAYmU="; + cargoSha256 = "sha256-s+xlrHaynHTMmm7rfjYrWNlIJRHO0QTjMlcV+LjqHNs="; }; }; }); From 9777bde6408459901c9fac71e3a92c163ef5ea36 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sun, 18 Dec 2022 12:21:14 +0100 Subject: [PATCH 40/44] updated mdbook-toc to 0.11.0 --- flake.lock | 6 +++--- flake.nix | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c2b8881..34d547a 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669411043, - "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", + "lastModified": 1671200928, + "narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", + "rev": "757b82211463dd5ba1475b6851d3731dfe14d377", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6685dca..4701178 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,7 @@ let pkgs = nixpkgs.legacyPackages.${system}; in { packages = rec { + default = mdbook-toc; container = pkgs.dockerTools.buildLayeredImage { name = "mdbook-container"; contents = [ @@ -23,16 +24,16 @@ }; mdbook-toc = pkgs.rustPlatform.buildRustPackage rec { pname = "mdbook-toc"; - version = "0.10.0"; + version = "0.11.0"; src = pkgs.fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - sha256 = "sha256-/MPxuzqgWKyLP1fn/WoA2cKlV0TiVidt+YpNqY96sxE="; + sha256 = "sha256-ORJV2+Uh8GwXU+EWUQ2ls+AcplYbpYhl6hvCuFdKpTk="; }; - cargoSha256 = "sha256-JFqkeea6o5Wzpe+2Fp+UYjBOh/e3vX1pZzCfxxfAYmU="; + cargoSha256 = "sha256-s+xlrHaynHTMmm7rfjYrWNlIJRHO0QTjMlcV+LjqHNs="; }; }; }); From 8e9413786ac670b5530343846b46e1f9f4cf5235 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 8 Sep 2023 13:43:04 +0200 Subject: [PATCH 41/44] add katex --- .woodpecker.yml | 17 ----------------- flake.lock | 30 ++++++++++++++++++++++++------ flake.nix | 13 +++++++------ 3 files changed, 31 insertions(+), 29 deletions(-) delete mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 3ea5953..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,17 +0,0 @@ -pipeline: - nix: - image: nixos/nix - environment: - - NIX_CONFIG=experimental-features = nix-command flakes - commands: - - nix flake check - - nix build '.#mdbook-toc' - publish: - image: git.0x76.dev/v/push-nix-container:0.3.3 - settings: - username: v - password: - from_secret: registry_password - package: container # nix os package to build - repo: git.0x76.dev - image: v/mdbook-container diff --git a/flake.lock b/flake.lock index 34d547a..c6a544c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -17,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671200928, - "narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=", + "lastModified": 1693985761, + "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "757b82211463dd5ba1475b6851d3731dfe14d377", + "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", "type": "github" }, "original": { @@ -36,6 +39,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4701178..9d86318 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "an container for mdbook with the toc plugin"; + description = "an container for mdbook with various plugins"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; @@ -11,29 +11,30 @@ let pkgs = nixpkgs.legacyPackages.${system}; in { packages = rec { - default = mdbook-toc; + default = container; container = pkgs.dockerTools.buildLayeredImage { name = "mdbook-container"; + tag = "0.4.0"; contents = [ (pkgs.buildEnv { name = "mdbook-env"; - paths = with pkgs; [ busybox mdbook mdbook-toc ]; + paths = with pkgs; [ busybox mdbook mdbook-toc mdbook-katex ]; }) ]; config.Cmd = [ "${pkgs.mdbook}/bin/mdbook" ]; }; mdbook-toc = pkgs.rustPlatform.buildRustPackage rec { pname = "mdbook-toc"; - version = "0.11.0"; + version = "0.14.1"; src = pkgs.fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - sha256 = "sha256-ORJV2+Uh8GwXU+EWUQ2ls+AcplYbpYhl6hvCuFdKpTk="; + sha256 = "sha256-F0dIqtDEOVUXlWhmXKPOaJTEuA3Tl3h0vaEu7VsBo7s="; }; - cargoSha256 = "sha256-s+xlrHaynHTMmm7rfjYrWNlIJRHO0QTjMlcV+LjqHNs="; + cargoSha256 = "sha256-gbBX6Hj+271BA9FWmkZdyR0tMP2Lny7UgW0o+kZe9bU="; }; }; }); From 8908bc21344868a4fe7d41b6d85a097444ee2d56 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Fri, 8 Sep 2023 13:43:04 +0200 Subject: [PATCH 42/44] add katex --- .woodpecker.yml | 17 ----------------- flake.lock | 30 ++++++++++++++++++++++++------ flake.nix | 13 +++++++------ 3 files changed, 31 insertions(+), 29 deletions(-) delete mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 3ea5953..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,17 +0,0 @@ -pipeline: - nix: - image: nixos/nix - environment: - - NIX_CONFIG=experimental-features = nix-command flakes - commands: - - nix flake check - - nix build '.#mdbook-toc' - publish: - image: git.0x76.dev/v/push-nix-container:0.3.3 - settings: - username: v - password: - from_secret: registry_password - package: container # nix os package to build - repo: git.0x76.dev - image: v/mdbook-container diff --git a/flake.lock b/flake.lock index 34d547a..c6a544c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -17,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671200928, - "narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=", + "lastModified": 1693985761, + "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "757b82211463dd5ba1475b6851d3731dfe14d377", + "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", "type": "github" }, "original": { @@ -36,6 +39,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4701178..9d86318 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "an container for mdbook with the toc plugin"; + description = "an container for mdbook with various plugins"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; @@ -11,29 +11,30 @@ let pkgs = nixpkgs.legacyPackages.${system}; in { packages = rec { - default = mdbook-toc; + default = container; container = pkgs.dockerTools.buildLayeredImage { name = "mdbook-container"; + tag = "0.4.0"; contents = [ (pkgs.buildEnv { name = "mdbook-env"; - paths = with pkgs; [ busybox mdbook mdbook-toc ]; + paths = with pkgs; [ busybox mdbook mdbook-toc mdbook-katex ]; }) ]; config.Cmd = [ "${pkgs.mdbook}/bin/mdbook" ]; }; mdbook-toc = pkgs.rustPlatform.buildRustPackage rec { pname = "mdbook-toc"; - version = "0.11.0"; + version = "0.14.1"; src = pkgs.fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - sha256 = "sha256-ORJV2+Uh8GwXU+EWUQ2ls+AcplYbpYhl6hvCuFdKpTk="; + sha256 = "sha256-F0dIqtDEOVUXlWhmXKPOaJTEuA3Tl3h0vaEu7VsBo7s="; }; - cargoSha256 = "sha256-s+xlrHaynHTMmm7rfjYrWNlIJRHO0QTjMlcV+LjqHNs="; + cargoSha256 = "sha256-gbBX6Hj+271BA9FWmkZdyR0tMP2Lny7UgW0o+kZe9bU="; }; }; }); From 9c3215ad648b459f67878da95605b792c3e586da Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 25 Sep 2023 12:22:35 +0200 Subject: [PATCH 43/44] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c6a544c..db382ba 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", + "lastModified": 1695360818, + "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", + "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "type": "github" }, "original": { From b88558280b43310a7b7e432bcd5291bd9c19fbde Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Mon, 25 Sep 2023 12:22:35 +0200 Subject: [PATCH 44/44] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c6a544c..db382ba 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", + "lastModified": 1695360818, + "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", + "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "type": "github" }, "original": {