Update to dinit.

tozd · Jul 11, 2023 · b2a7c4b · b2a7c4b
1 parent 159a4e1
commit b2a7c4b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Available as:
 
 ## Image inheritance
 
-[`tozd/base`](https://gitlab.com/tozd/docker/base) ← [`tozd/runit`](https://gitlab.com/tozd/docker/runit) ← `tozd/meteor`
+[`tozd/base`](https://gitlab.com/tozd/docker/base) ← [`tozd/dinit`](https://gitlab.com/tozd/docker/dinit) ← `tozd/meteor`
 
 See also [`tozd/meteor-testing`](https://gitlab.com/tozd/docker/meteor-testing).
 

diff --git a/etc/service/meteor/log/run b/etc/service/meteor/log/run
@@ -1,14 +1,12 @@
 #!/bin/bash -e
 
-# You can mount a volume (file) into this location to provide a script which sets environment variables.
-[ -f /etc/service/meteor/run.config ] && source /etc/service/meteor/run.config
-
 if [ "${LOG_TO_STDOUT}" != "1" ]; then
   mkdir -p /var/log/meteor
   chown nobody:nogroup /var/log/meteor
 
   exec chpst -u nobody:nogroup svlogd -tt /var/log/meteor
 else
-  exec chpst -u nobody:nogroup tee
+  # TODO: Exit with 115. See: https://gitlab.com/tozd/dinit/-/issues/1
+  exec chpst -u nobody:nogroup cat
 fi
 
diff --git a/etc/service/meteor/run b/etc/service/meteor/run
@@ -2,9 +2,6 @@
 
 export NODE_ENV="production"
 
-# Redirect stderr to stdout to preserve the order between stdout and stderr.
-exec 2>&1
-
 # File created by Dockerfile containing NODE_PATH to Meteor's node.
 # We are making Meteor's node be useful system wide.
 [ -f /etc/service/meteor/run.env ] && source /etc/service/meteor/run.env

diff --git a/ubuntu-bionic.dockerfile b/ubuntu-bionic.dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/tozd/docker/runit:ubuntu-bionic
+FROM registry.gitlab.com/tozd/docker/dinit:ubuntu-bionic
 
 EXPOSE 3000/tcp
 

diff --git a/ubuntu-focal.dockerfile b/ubuntu-focal.dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/tozd/docker/runit:ubuntu-focal
+FROM registry.gitlab.com/tozd/docker/dinit:ubuntu-focal
 
 EXPOSE 3000/tcp
 

diff --git a/ubuntu-jammy.dockerfile b/ubuntu-jammy.dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/tozd/docker/runit:ubuntu-jammy
+FROM registry.gitlab.com/tozd/docker/dinit:ubuntu-jammy
 
 EXPOSE 3000/tcp
 

diff --git a/ubuntu-xenial.dockerfile b/ubuntu-xenial.dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/tozd/docker/runit:ubuntu-xenial
+FROM registry.gitlab.com/tozd/docker/dinit:ubuntu-xenial
 
 EXPOSE 3000/tcp