Move images to separate repo
This commit is contained in:
+1
-4
@@ -1,4 +1,4 @@
|
||||
{ pkgs, top, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
c = pkgs.callPackage;
|
||||
@@ -15,9 +15,6 @@ in
|
||||
hms = c ./hms { };
|
||||
inject-darwin = c ./inject-darwin.nix { };
|
||||
inject = c ./inject.nix { };
|
||||
img-bitwarden = c ./img-bitwarden.nix { };
|
||||
img-builder = c ./img-builder.nix { inherit top; };
|
||||
img-immich = c ./img-immich.nix { };
|
||||
qemu-hook = c ./qemu-hook.nix { };
|
||||
setup-ssh = c ./setup-ssh { };
|
||||
upgrade-pg-cluster = c ./upgrade-pg-cluster.nix { };
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
{
|
||||
bitwarden-cli,
|
||||
cacert,
|
||||
dockerTools,
|
||||
lib,
|
||||
wget,
|
||||
writeShellApplication,
|
||||
...
|
||||
}:
|
||||
dockerTools.buildLayeredImage {
|
||||
name = "registry.thehellings.com/greg/nixos-config/img-bitwarden";
|
||||
tag = "latest";
|
||||
contents = [
|
||||
dockerTools.binSh
|
||||
dockerTools.caCertificates
|
||||
wget
|
||||
];
|
||||
config = {
|
||||
Cmd = [
|
||||
(lib.getExe (writeShellApplication {
|
||||
name = "bitwarden-cli-entrypoint.sh";
|
||||
runtimeInputs = [ bitwarden-cli ];
|
||||
text = ''
|
||||
set -ex
|
||||
|
||||
# Uncomment if you need to hit a custom host
|
||||
#bw config server ''${BW_HOST}
|
||||
|
||||
echo "Using apikey to log in"
|
||||
bw login --apikey --raw
|
||||
BW_SESSION="$(bw unlock --passwordenv BW_PASSWORD --raw)"
|
||||
export BW_SESSION
|
||||
|
||||
echo 'Running "bw serve" on port 8087'
|
||||
bw serve --hostname all --port 8087
|
||||
'';
|
||||
}))
|
||||
];
|
||||
Env = [
|
||||
"CURL_CA_BUNDLE=${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
];
|
||||
ExposedPorts = {
|
||||
"8087/tcp" = { };
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
{
|
||||
bashInteractive,
|
||||
dockerTools,
|
||||
git,
|
||||
lib,
|
||||
nix,
|
||||
pkgs,
|
||||
podman,
|
||||
top,
|
||||
writeShellApplication,
|
||||
...
|
||||
}:
|
||||
let
|
||||
policy = (
|
||||
pkgs.writeTextFile {
|
||||
name = "policy.json";
|
||||
text = ''
|
||||
{
|
||||
"default": [{"type": "insecureAcceptAnything"}]
|
||||
}
|
||||
'';
|
||||
destination = "/etc/containers/policy.json";
|
||||
}
|
||||
);
|
||||
activate = writeShellApplication {
|
||||
name = "activate";
|
||||
runtimeInputs = [ bashInteractive ];
|
||||
text = ''
|
||||
mkdir -p /etc/containers
|
||||
cp ${policy}/etc/containers/policy.json /etc/containers/policy.json;
|
||||
bash "$@"
|
||||
'';
|
||||
};
|
||||
in
|
||||
(import "${nix.src.outPath}/docker.nix" {
|
||||
inherit pkgs;
|
||||
name = "registry.thehellings.com/greg/nixos-config/img-builder";
|
||||
tag = "latest";
|
||||
|
||||
bundleNixpkgs = false;
|
||||
Cmd = [
|
||||
(lib.getExe activate)
|
||||
];
|
||||
extraPkgs = [
|
||||
dockerTools.caCertificates
|
||||
podman
|
||||
policy
|
||||
];
|
||||
flake-registry = (pkgs.formats.json { }).generate "flake-registry.json" ({
|
||||
version = 2;
|
||||
flakes.nixpkgs = {
|
||||
exact = true;
|
||||
from = {
|
||||
id = "nixpkgs";
|
||||
type = "indirect";
|
||||
};
|
||||
to = "${top.nixunstable}";
|
||||
};
|
||||
});
|
||||
gitMinimal = git; # We want the full version in this
|
||||
maxLayers = 111;
|
||||
nixConf = {
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -1,24 +0,0 @@
|
||||
{
|
||||
immich-go,
|
||||
cacert,
|
||||
dockerTools,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
dockerTools.buildLayeredImage {
|
||||
name = "registry.thehellings.com/greg/nixos-config/img-immich";
|
||||
tag = "latest";
|
||||
contents = [
|
||||
dockerTools.binSh
|
||||
dockerTools.caCertificates
|
||||
immich-go
|
||||
];
|
||||
config = {
|
||||
Cmd = [
|
||||
(lib.getExe immich-go)
|
||||
];
|
||||
Env = [
|
||||
"CURL_CA_BUNDLE=${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
];
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user