Clean up Nix builder and release 0.1.1
This commit is contained in:
parent
15486c36ca
commit
11055e6fb4
4 changed files with 13 additions and 18 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
FROM --platform=$BUILDPLATFORM rust:1.86.0-alpine3.21 AS builder
|
FROM --platform=$BUILDPLATFORM rust:1.92.0-alpine3.22 AS builder
|
||||||
ENV PKGCONFIG_SYSROOTDIR=/
|
ENV PKGCONFIG_SYSROOTDIR=/
|
||||||
RUN apk add --no-cache musl-dev perl build-base zig
|
RUN apk add --no-cache musl-dev perl build-base zig
|
||||||
RUN cargo install --locked cargo-zigbuild
|
RUN cargo install --locked cargo-zigbuild
|
||||||
|
|
|
||||||
10
README.md
10
README.md
|
|
@ -15,16 +15,6 @@ Still very much an early WIP.
|
||||||
- Post pools.
|
- Post pools.
|
||||||
- RSS feeds.
|
- RSS feeds.
|
||||||
|
|
||||||
### Possible roadmap
|
|
||||||
|
|
||||||
- [ ] Display thumbnails on post selection
|
|
||||||
- [ ] Text media
|
|
||||||
- [ ] Testing
|
|
||||||
- [ ] Improve CSS
|
|
||||||
- [ ] User management
|
|
||||||
- [ ] Lossless compression
|
|
||||||
- [ ] Migrate to Cot...?
|
|
||||||
|
|
||||||
## Running
|
## Running
|
||||||
|
|
||||||
### Dependencies
|
### Dependencies
|
||||||
|
|
|
||||||
18
default.nix
18
default.nix
|
|
@ -11,6 +11,7 @@ let
|
||||||
crate-info = fromTOML (builtins.readFile ./Cargo.toml);
|
crate-info = fromTOML (builtins.readFile ./Cargo.toml);
|
||||||
pname = crate-info.package.name;
|
pname = crate-info.package.name;
|
||||||
version = crate-info.package.version;
|
version = crate-info.package.version;
|
||||||
|
description = crate-info.package.description;
|
||||||
|
|
||||||
docker-image = "badmanners/${pname}";
|
docker-image = "badmanners/${pname}";
|
||||||
cargo-deps-hash = "sha256-PD/ZR/sdmqA18xcOi9AnwQtDYVyELPS6GBF/pzcJzkE=";
|
cargo-deps-hash = "sha256-PD/ZR/sdmqA18xcOi9AnwQtDYVyELPS6GBF/pzcJzkE=";
|
||||||
|
|
@ -62,7 +63,7 @@ let
|
||||||
|
|
||||||
mkRustPkg =
|
mkRustPkg =
|
||||||
targetTriple:
|
targetTriple:
|
||||||
stdenv.mkDerivation {
|
(stdenv.mkDerivation {
|
||||||
inherit
|
inherit
|
||||||
pname
|
pname
|
||||||
version
|
version
|
||||||
|
|
@ -89,6 +90,12 @@ let
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cp ./target/${targetTriple}/release/${pname} $out/bin/
|
cp ./target/${targetTriple}/release/${pname} $out/bin/
|
||||||
'';
|
'';
|
||||||
|
})
|
||||||
|
// {
|
||||||
|
meta = {
|
||||||
|
inherit description;
|
||||||
|
mainProgram = pname;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
mkDocker =
|
mkDocker =
|
||||||
|
|
@ -107,16 +114,13 @@ let
|
||||||
crossSystem = system;
|
crossSystem = system;
|
||||||
});
|
});
|
||||||
rust-package = mkRustPkg targetTriple;
|
rust-package = mkRustPkg targetTriple;
|
||||||
|
ffmpeg = pkgs.ffmpeg_8-headless;
|
||||||
in
|
in
|
||||||
pkgs-cross.dockerTools.buildLayeredImage {
|
pkgs-cross.dockerTools.buildLayeredImage {
|
||||||
name = docker-image;
|
name = docker-image;
|
||||||
inherit tag;
|
inherit tag;
|
||||||
contents = [
|
contents = [ ffmpeg ];
|
||||||
pkgs.ffmpeg-headless
|
config.Entrypoint = [ (lib.getExe rust-package) ];
|
||||||
];
|
|
||||||
config.Entrypoint = [
|
|
||||||
"${rust-package}/bin/${pname}"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
currentTargetTriple =
|
currentTargetTriple =
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
packages = [
|
packages = [
|
||||||
pkgs.bacon
|
pkgs.bacon
|
||||||
|
pkgs.ffmpeg_8-headless
|
||||||
pkgs.just
|
pkgs.just
|
||||||
pkgs.rust-bin.stable.latest.default
|
pkgs.rust-bin.stable.latest.default
|
||||||
pkgs.sea-orm-cli
|
pkgs.sea-orm-cli
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue