prescientmoon/satellite
1
Fork 0
Code Activity

Update to newer docker-compose.nix

Browse source
This commit is contained in:
prescientmoon 2024-10-12 22:10:55 +02:00
parent b38da515ea
commit 190dde841e
Signed by: prescientmoon
SSH key fingerprint: SHA256:WFp/cO76nbarETAoQcQXuV+0h7XJsEsOCI0UsyPIy6U
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hosts/nixos/lapetus/services/5d-diplomacy/default.nix
View file

@ -1,5 +1,11 @@
{ config, ... }: { config, ... }:
{ {
# Regenerate by going to the 5d-diplomacy directory and running:
# nix run github:aksiksi/compose2nix -- \
# -project 5d-diplomacy \
# -runtime docker \
# -write_nix_setup=false \
# -build
imports = [ ./generated.nix ]; imports = [ ./generated.nix ];
satellite.cloudflared.at.dip.port = config.satellite.ports."5d-diplomacy"; satellite.cloudflared.at.dip.port = config.satellite.ports."5d-diplomacy";

8
hosts/nixos/lapetus/services/5d-diplomacy/generated.nix
View file

@ -5,7 +5,7 @@
# Containers # Containers
virtualisation.oci-containers.containers."5d-diplomacy-backend" = { virtualisation.oci-containers.containers."5d-diplomacy-backend" = {
image = "compose2nix-5d-diplomacy-backend"; image = "compose2nix/5d-diplomacy-backend";
environment = { environment = {
"ConnectionStrings__Database" = "Server=mssql;Database=diplomacy;User=SA;Password=Passw0rd@;Encrypt=True;TrustServerCertificate=True"; "ConnectionStrings__Database" = "Server=mssql;Database=diplomacy;User=SA;Password=Passw0rd@;Encrypt=True;TrustServerCertificate=True";
}; };
@ -34,7 +34,7 @@
wantedBy = [ "docker-compose-5d-diplomacy-root.target" ]; wantedBy = [ "docker-compose-5d-diplomacy-root.target" ];
}; };
virtualisation.oci-containers.containers."5d-diplomacy-frontend" = { virtualisation.oci-containers.containers."5d-diplomacy-frontend" = {
image = "compose2nix-5d-diplomacy-frontend"; image = "compose2nix/5d-diplomacy-frontend";
log-driver = "journald"; log-driver = "journald";
extraOptions = [ extraOptions = [
"--network-alias=frontend" "--network-alias=frontend"
@ -109,7 +109,7 @@
TimeoutSec = 300; TimeoutSec = 300;
}; };
script = '' script = ''
docker build -t compose2nix-5d-diplomacy-backend https://github.com/Oliveriver/5d-diplomacy-with-multiverse-time-travel.git#main:server docker build -t compose2nix/5d-diplomacy-backend https://github.com/Oliveriver/5d-diplomacy-with-multiverse-time-travel.git#main:server
''; '';
partOf = [ "docker-compose-5d-diplomacy-root.target" ]; partOf = [ "docker-compose-5d-diplomacy-root.target" ];
wantedBy = [ "docker-compose-5d-diplomacy-root.target" ]; wantedBy = [ "docker-compose-5d-diplomacy-root.target" ];
@ -125,7 +125,7 @@
TimeoutSec = 300; TimeoutSec = 300;
}; };
script = '' script = ''
docker build -t compose2nix-5d-diplomacy-frontend https://github.com/Oliveriver/5d-diplomacy-with-multiverse-time-travel.git#main:client docker build -t compose2nix/5d-diplomacy-frontend https://github.com/Oliveriver/5d-diplomacy-with-multiverse-time-travel.git#main:client
''; '';
partOf = [ "docker-compose-5d-diplomacy-root.target" ]; partOf = [ "docker-compose-5d-diplomacy-root.target" ];
wantedBy = [ "docker-compose-5d-diplomacy-root.target" ]; wantedBy = [ "docker-compose-5d-diplomacy-root.target" ];

10
hosts/nixos/lapetus/services/commafeed.nix
View file

@ -14,8 +14,14 @@ in
volumes = [ "${dataDir}:/commafeed/data" ]; # server:docker volumes = [ "${dataDir}:/commafeed/data" ]; # server:docker
# the JVM is way too hungry # the JVM is way too hungry
entrypoint = builtins.toJSON entrypoint = builtins.toJSON [
[ "java" "-Xmx64m" "-jar" "commafeed.jar" "server" "config.yml" ]; "java"
"-Xmx64m"
"-jar"
"commafeed.jar"
"server"
"config.yml"
];
# https://github.com/Athou/commafeed/blob/master/commafeed-server/config.yml.example # https://github.com/Athou/commafeed/blob/master/commafeed-server/config.yml.example
environment = { environment = {