Updates the non-interactive container to use tini rather than requiring --init

Author: michaelmcdonnellmw

alternates/non-interactive/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2024-2025 The MathWorks, Inc.
+# Copyright 2024-2026 The MathWorks, Inc.
 # This Dockerfile allows you to build a Docker® image with MATLAB® installed using the MATLAB Package
 # Manager and licensed using MATLAB Batch Licensing. Use the optional build arguments to customize the
 # version of MATLAB, list of products to install, and the location at which to install MATLAB.
@@ -28,13 +28,14 @@ ARG MATLAB_RELEASE
 ARG MATLAB_PRODUCT_LIST
 ARG MATLAB_INSTALL_LOCATION
 
-# Install mpm dependencies.
+# Install mpm dependencies along with those required to run matlab-batch within the container.
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update \
     && apt-get install --no-install-recommends --yes \
     wget \
     ca-certificates \
     xvfb \
+    tini \
     && apt-get clean \
     && apt-get autoremove \
     && rm -rf /var/lib/apt/lists/*
@@ -74,5 +75,5 @@ RUN wget -q 'https://raw.githubusercontent.com/mathworks-ref-arch/matlab-dockerf
 # https://github.com/mathworks-ref-arch/matlab-dockerfile#help-make-matlab-even-better
 ENV MW_DDUX_FORCE_ENABLE=true MW_CONTEXT_TAGS=MATLAB:BATCHLICENSING:DOCKERFILE:V1
 
-ENTRYPOINT ["xvfb-run"]
+ENTRYPOINT ["tini", "--", "xvfb-run"]
 CMD ["/bin/bash"]

alternates/non-interactive/README.md

@@ -28,10 +28,10 @@ Build a container with a name and tag.
 docker build -t matlab-non-interactive:R2025b .
 ```
 
-You can then run the container and use the `matlab-batch` command. Test the container by running an example MATLAB command, such as `rand`. Use the --init flag in the docker run command to ensure that the container stops gracefully when a docker stop or docker kill command is issued.
+You can then run the container and use the `matlab-batch` command. Test the container by running an example MATLAB command, such as `rand`.
 
 ```bash
-docker run --init --rm matlab-non-interactive:R2025b matlab-batch -licenseToken "user@email.com::encodedToken" "rand"
+docker run --rm matlab-non-interactive:R2025b matlab-batch -licenseToken "user@email.com::encodedToken" "rand"
 ```
 For more information, see [Run the Container](#run-the-container).
 
@@ -86,22 +86,22 @@ With the `docker run` command, use one of these options.
 - Specify the `-licenseToken` run-arg.
     ```bash
     # Example
-    docker run --init --rm matlab-non-interactive:R2025b matlab-batch -licenseToken "user@email.com::encodedToken" "disp('Hello, World.')"
+    docker run --rm matlab-non-interactive:R2025b matlab-batch -licenseToken "user@email.com::encodedToken" "disp('Hello, World.')"
     ```
 
 - Specify the `MLM_LICENSE_TOKEN` environment variable.
     ```bash
     # Example
     export MLM_LICENSE_TOKEN="user@email.com::encodedToken"
-    docker run --init --rm -e MLM_LICENSE_TOKEN matlab-non-interactive:R2025b matlab-batch "disp('Hello, World.')"
+    docker run --rm -e MLM_LICENSE_TOKEN matlab-non-interactive:R2025b matlab-batch "disp('Hello, World.')"
     ```
 
 ## Run the Container
 This Dockerfile's default entry-point is a shell session. After you start the container, use `matlab-batch` to start MATLAB with a MATLAB batch licensing token.
 
 ```bash
 # Launch MATLAB, print Hello, World., and exit:
-docker run --init --rm matlab-non-interactive:R2025b matlab-batch -licenseToken "user@email.com::encodedToken" "disp('Hello, World.')"
+docker run --rm matlab-non-interactive:R2025b matlab-batch -licenseToken "user@email.com::encodedToken" "disp('Hello, World.')"
 ```
 
 You can set your MATLAB batch licensing token at the container level by setting the `MLM_LICENSE_TOKEN` environment variable, as shown in the examples below.
@@ -111,15 +111,15 @@ To start the container, run a MATLAB command and exit, use this command.
 ```bash
 # Container runs the command RAND in MATLAB and exits.
 export MLM_LICENSE_TOKEN="user@email.com::encodedToken"
-docker run --init --rm -e MLM_LICENSE_TOKEN matlab-non-interactive:R2025b matlab-batch rand
+docker run --rm -e MLM_LICENSE_TOKEN matlab-non-interactive:R2025b matlab-batch rand
 ```
 
 ### Run a MATLAB script
 To start the container, run a MATLAB script and exit, use this command.
 ```bash
 # Container runs the script myscript.m in MATLAB and exits.
 export MLM_LICENSE_TOKEN="user@email.com::encodedToken"
-docker run --init --rm -v $(pwd):/content -w /content -e MLM_LICENSE_TOKEN matlab-non-interactive:R2025b matlab-batch "myscript"
+docker run --rm -v $(pwd):/content -w /content -e MLM_LICENSE_TOKEN matlab-non-interactive:R2025b matlab-batch "myscript"
 ```
 
 ## More MATLAB Docker Resources
@@ -137,4 +137,4 @@ To learn more, see the documentation: [Help Make MATLAB Even Better - Frequently
 We encourage you to try this repository with your environment and provide feedback. If you encounter a technical issue or have an enhancement request, create an issue [here](https://github.com/mathworks-ref-arch/matlab-dockerfile/issues).
 
 ---
-Copyright 2024-2025 The MathWorks, Inc.
+Copyright 2024-2026 The MathWorks, Inc.

tests/alternates/non-interactive/test_matlabbatch_display.py

@@ -1,4 +1,4 @@
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2026 The MathWorks, Inc.
 
 """
 Test class to validate the non-interactive dockerfile.
@@ -40,7 +40,7 @@ def test_display_workflow(self):
         runDisplayTest will run some example tests that require a display.
         This is equivalent to running
 
-        docker run --init -it --rm -e MLM_LICENSE_TOKEN=... non-interactive:r2024a matlab-batch runDisplayTest
+        docker run -it --rm -e MLM_LICENSE_TOKEN=... non-interactive:r2024a matlab-batch runDisplayTest
         """
         cmd = "matlab-batch runDisplayTest"
         mtest_file_name = "runDisplayTest.m"
@@ -56,7 +56,6 @@ def test_display_workflow(self):
 
         self.container = self.client.containers.run(
             image=self.image_name,
-            init=True,
             detach=True,
             stdin_open=True,
             environment={"MLM_LICENSE_TOKEN": os.getenv("BATCH_TOKEN")},