chore: format with alejandra
This commit is contained in:
parent
05f0cbdfb4
commit
89f5f65f2d
181 changed files with 2720 additions and 2560 deletions
|
@ -1,9 +1,6 @@
|
|||
{ pkgs ? import <nixpkgs> { } }:
|
||||
|
||||
let baseEnv = [ "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ];
|
||||
|
||||
{pkgs ? import <nixpkgs> {}}: let
|
||||
baseEnv = ["SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"];
|
||||
in rec {
|
||||
|
||||
base = pkgs.dockerTools.buildImage rec {
|
||||
name = "base";
|
||||
|
||||
|
@ -24,9 +21,9 @@ in rec {
|
|||
interactive_base = pkgs.dockerTools.buildImage {
|
||||
name = "interactive_base";
|
||||
fromImage = base;
|
||||
contents = with pkgs; [ procps zsh coreutils neovim ];
|
||||
contents = with pkgs; [procps zsh coreutils neovim];
|
||||
|
||||
config = { Cmd = [ "/bin/zsh" ]; };
|
||||
config = {Cmd = ["/bin/zsh"];};
|
||||
};
|
||||
|
||||
s3ql = let
|
||||
|
@ -50,7 +47,7 @@ in rec {
|
|||
|
||||
set -x
|
||||
|
||||
if [ "$S3QL_SKIP_FSCK" != "1" ]; then
|
||||
if [ "$S3QL_SKIP_FSCK" != "1" ]; then
|
||||
fsck.s3ql \
|
||||
--authfile $S3QL_AUTHINFO2 \
|
||||
--log none \
|
||||
|
@ -70,37 +67,40 @@ in rec {
|
|||
"$S3QL_STORAGE_URL" \
|
||||
/bucket
|
||||
|
||||
# FIXME: touch .isbucket after mount
|
||||
# FIXME: touch .isbucket after mount
|
||||
'';
|
||||
in pkgs.dockerTools.buildImage {
|
||||
name = "s3ql";
|
||||
fromImage = interactive_base;
|
||||
contents = [ pkgs.s3ql pkgs.fuse ];
|
||||
in
|
||||
pkgs.dockerTools.buildImage {
|
||||
name = "s3ql";
|
||||
fromImage = interactive_base;
|
||||
contents = [pkgs.s3ql pkgs.fuse];
|
||||
|
||||
runAsRoot = ''
|
||||
#!${pkgs.stdenv.shell}
|
||||
mkdir -p /usr/bin
|
||||
cp -a ${pkgs.fuse}/bin/fusermount /usr/bin
|
||||
chmod +s /usr/bin/fusermount
|
||||
echo user_allow_other >> /etc/fuse.conf
|
||||
'';
|
||||
runAsRoot = ''
|
||||
#!${pkgs.stdenv.shell}
|
||||
mkdir -p /usr/bin
|
||||
cp -a ${pkgs.fuse}/bin/fusermount /usr/bin
|
||||
chmod +s /usr/bin/fusermount
|
||||
echo user_allow_other >> /etc/fuse.conf
|
||||
'';
|
||||
|
||||
config = {
|
||||
Env = baseEnv ++ [
|
||||
"HOME=/home/s3ql"
|
||||
"S3QL_CACHE_DIR=/var/cache/s3ql"
|
||||
"S3QL_AUTHINFO2=/etc/s3ql/authinfo2"
|
||||
"CONTAINER_ENTRYPOINT=${entrypoint}"
|
||||
];
|
||||
Cmd = [ entrypoint ];
|
||||
Volumes = {
|
||||
"/var/cache/s3ql" = { };
|
||||
"/etc/s3ql/authinfo2" = { };
|
||||
"/buckets" = { };
|
||||
"/tmp" = { };
|
||||
config = {
|
||||
Env =
|
||||
baseEnv
|
||||
++ [
|
||||
"HOME=/home/s3ql"
|
||||
"S3QL_CACHE_DIR=/var/cache/s3ql"
|
||||
"S3QL_AUTHINFO2=/etc/s3ql/authinfo2"
|
||||
"CONTAINER_ENTRYPOINT=${entrypoint}"
|
||||
];
|
||||
Cmd = [entrypoint];
|
||||
Volumes = {
|
||||
"/var/cache/s3ql" = {};
|
||||
"/etc/s3ql/authinfo2" = {};
|
||||
"/buckets" = {};
|
||||
"/tmp" = {};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
syncthing = let
|
||||
entrypoint = pkgs.writeScript "entrypoint" ''
|
||||
|
@ -125,15 +125,16 @@ in rec {
|
|||
-gui-address=$SYNCTHING_GUI_ADDRESS \
|
||||
-no-browser
|
||||
'';
|
||||
in pkgs.dockerTools.buildImage {
|
||||
name = "syncthing";
|
||||
fromImage = interactive_base;
|
||||
contents = pkgs.syncthing;
|
||||
in
|
||||
pkgs.dockerTools.buildImage {
|
||||
name = "syncthing";
|
||||
fromImage = interactive_base;
|
||||
contents = pkgs.syncthing;
|
||||
|
||||
config = {
|
||||
Env = baseEnv ++ [ "SYNCTHING_HOME=/home/syncthing" ];
|
||||
Cmd = [ entrypoint ];
|
||||
Volumes = { "/data" = { }; };
|
||||
config = {
|
||||
Env = baseEnv ++ ["SYNCTHING_HOME=/home/syncthing"];
|
||||
Cmd = [entrypoint];
|
||||
Volumes = {"/data" = {};};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue