Compare commits
No commits in common. "10c86c6b2070540d17549177dcf4260d88b80c53" and "fef1874938c50bd33fe0e7db9a11aedc90f703d9" have entirely different histories.
10c86c6b20
...
fef1874938
|
@ -59,8 +59,7 @@ in {
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
serviceConfig.Type = "oneshot";
|
serviceConfig.Type = "oneshot";
|
||||||
before = [ "docker-obs-portal.service" "docker-obs-portal-db.service" "docker-obs-portal-worker.service" ];
|
before = [ "docker-obs-portal.service" ];
|
||||||
requiredBy = [ "docker-obs-portal.service" "docker-obs-portal-db.service" "docker-obs-portal-worker.service" ];
|
|
||||||
script = ''
|
script = ''
|
||||||
${dockerBin} network inspect obs-portal-net >/dev/null 2>&1 || ${dockerBin} network create obs-portal-net --subnet 172.20.0.0/24
|
${dockerBin} network inspect obs-portal-net >/dev/null 2>&1 || ${dockerBin} network create obs-portal-net --subnet 172.20.0.0/24
|
||||||
'';
|
'';
|
||||||
|
@ -86,11 +85,7 @@ in {
|
||||||
containers."obs-portal" = {
|
containers."obs-portal" = {
|
||||||
image = "git.pub.solar/pub-solar/obs-portal:latest";
|
image = "git.pub.solar/pub-solar/obs-portal:latest";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
ports = [ "127.0.0.1:3001:${env.OBS_PORT}" ];
|
ports = [ "localhost:3001:${env.OBS_PORT}" ];
|
||||||
dependsOn = [
|
|
||||||
"obs-portal-db"
|
|
||||||
"obs-portal-worker"
|
|
||||||
];
|
|
||||||
|
|
||||||
environment = env;
|
environment = env;
|
||||||
environmentFiles = [ config.age.secrets.obs-portal-env.path ];
|
environmentFiles = [ config.age.secrets.obs-portal-env.path ];
|
||||||
|
@ -98,6 +93,7 @@ in {
|
||||||
volumes = [
|
volumes = [
|
||||||
"${configPy}:/opt/obs/api/config.py"
|
"${configPy}:/opt/obs/api/config.py"
|
||||||
"/var/lib/obs-portal${env.OBS_DATA_DIR}:${env.OBS_DATA_DIR}"
|
"/var/lib/obs-portal${env.OBS_DATA_DIR}:${env.OBS_DATA_DIR}"
|
||||||
|
"/var/lib/obs-portal/tiles/:/tiles"
|
||||||
"/var/lib/obs-portal/pbf/:/pbf"
|
"/var/lib/obs-portal/pbf/:/pbf"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue