Skip to content

Commit 1c30839

Browse files
committed
Rename Node Ubuntu slim Docker image
1 parent 0e4fc21 commit 1c30839

11 files changed

Lines changed: 36 additions & 31 deletions

.github/workflows/docker-buildx-24-ubuntu-slim.yml renamed to .github/workflows/docker-buildx-node-ubuntu-slim.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
name: Build Docker Image 24-ubuntu-slim with buildx
1+
name: Build Docker Image node-ubuntu-slim with buildx
22

33
on:
44
# Allow manual dispatch
55
workflow_dispatch:
66

77
# Cancel previous runs when a new one is triggered
88
concurrency:
9-
group: docker-build-24-ubuntu-slim
9+
group: docker-build-node-ubuntu-slim
1010
cancel-in-progress: true
1111

1212
jobs:
@@ -42,20 +42,20 @@ jobs:
4242
with:
4343
version: latest
4444

45-
- name: Run Docker Buildx with Dockerfile.24-ubuntu-slim for version ${{ steps.meta.outputs.VERSION }}
45+
- name: Run Docker Buildx with Dockerfile.node-ubuntu-slim for version ${{ steps.meta.outputs.VERSION }}
4646
run: |
4747
docker buildx build \
4848
--no-cache \
4949
--pull \
5050
--platform linux/amd64,linux/arm64 \
51-
-f docker/Dockerfile.24-ubuntu-slim \
52-
-t luligu/matterbridge:24-ubuntu-slim \
53-
-t luligu/matterbridge:24-ubuntu-slim-${{ steps.meta.outputs.VERSION }} \
51+
-f docker/Dockerfile.node-ubuntu-slim \
52+
-t luligu/matterbridge:node-ubuntu-slim \
53+
-t luligu/matterbridge:node-ubuntu-slim-${{ steps.meta.outputs.VERSION }} \
5454
--build-arg VERSION=${{ steps.meta.outputs.VERSION }} \
5555
--build-arg VCS_REF=${{ steps.meta.outputs.VCS_REF }} \
5656
--build-arg BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }} \
5757
--push .
58-
docker manifest inspect luligu/matterbridge:24-ubuntu-slim
58+
docker manifest inspect luligu/matterbridge:node-ubuntu-slim
5959
6060
- name: Trigger Matterbridge Docker Build Ubuntu
6161
uses: actions/github-script@v9

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,15 @@ jobs:
133133
ref: 'main'
134134
})
135135
136-
- name: Trigger Matterbridge Docker Build 24-ubuntu-slim
136+
- name: Trigger Matterbridge Docker Build node-ubuntu-slim
137137
uses: actions/github-script@v9
138138
with:
139139
github-token: ${{ secrets.PAT_TOKEN }}
140140
script: |
141141
await github.rest.actions.createWorkflowDispatch({
142142
owner: context.repo.owner,
143143
repo: context.repo.repo,
144-
workflow_id: 'docker-buildx-24-ubuntu-slim.yml',
144+
workflow_id: 'docker-buildx-node-ubuntu-slim.yml',
145145
ref: 'main'
146146
})
147147

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ If you like this project and find it useful, please consider giving it a star on
5454

5555
### Changed
5656

57+
- [docker]: Rename the **24-ubuntu-slim** base image and its Dockerfile, entrypoint, Docker ignore file, workflow, scripts, and documentation to **node-ubuntu-slim**.
5758
- [matterbridge]: Bump `matterbridge` version to v.3.10.7.
5859
- [matterbridge]: Bump `@types/bun` to v.1.4.0.
5960
- [matterbridge]: Bump `@vitest/coverage-v8` to v.4.1.11.

README-DOCKER.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ The image (tag **chip-test** 400MB) is based on `ubuntu:latest` with Node.js 24
4949

5050
### Matterbridge docker base images
5151

52-
The image (tag **24-ubuntu-slim** 83 MB) is based on `ubuntu:latest` with Node.js 24 LTS from NodeSource. It is used to build the **ubuntu** image but can also be used to open a shell in ubuntu latest with node 24 (node doesn't publish node:24-ubuntu).
52+
The image (tag **node-ubuntu-slim** 83 MB) is based on `ubuntu:latest` with Node.js 24 LTS from NodeSource. It is used to build the **ubuntu** image but can also be used to open a shell in ubuntu latest with node 24 (node doesn't publish node:24-ubuntu).
5353

54-
The image (tag **bun-ubuntu-slim** 79 MB) is based on `ubuntu:latest` with Bun from GitHub. It can be used to open a shell in ubuntu latest with Bun.
54+
The image (tag **bun-ubuntu-slim** 79 MB) is based on `ubuntu:latest` with Bun from GitHub. It can be used to open a shell in ubuntu latest with Bun (bun doesn't publish an ubuntu based image).
5555

5656
### Matterbridge Dev Container images
5757

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN \
1414
set -eux \
1515
&& DPKG_ARCH=$(dpkg --print-architecture) \
1616
&& if [ "${DPKG_ARCH}" = "armhf" ]; then \
17-
echo >&2 "ERROR: docker/Dockerfile.24-ubuntu-slim does not support linux/arm/v7 (armhf)."; \
17+
echo >&2 "ERROR: docker/Dockerfile.node-ubuntu-slim does not support linux/arm/v7 (armhf)."; \
1818
echo >&2 " Node.js v24 does not publish linux-armv7l binaries on nodejs.org."; \
1919
exit 1; \
2020
fi \
@@ -64,7 +64,7 @@ ARG VCS_REF
6464
ARG BUILD_DATE
6565

6666
# ---- OCI standard labels (https://opencontainers.org/) ----
67-
LABEL org.opencontainers.image.title="matterbridge:24-ubuntu-slim" \
67+
LABEL org.opencontainers.image.title="matterbridge:node-ubuntu-slim" \
6868
org.opencontainers.image.description="Ubuntu 24.04.4 LTS (noble) with Node.js 24 from nodejs.org" \
6969
org.opencontainers.image.version=$VERSION \
7070
org.opencontainers.image.revision=$VCS_REF \
@@ -83,7 +83,7 @@ RUN \
8383
&& rm -rf /usr/share/doc/* /usr/share/man/* /usr/share/info/* /usr/share/lintian/* /usr/share/locale/*
8484

8585
# Copy and execute the entrypoint script
86-
COPY ./docker/entrypoint.24-ubuntu-slim.sh ./
87-
RUN chmod +x ./entrypoint.24-ubuntu-slim.sh
88-
ENTRYPOINT ["./entrypoint.24-ubuntu-slim.sh"]
86+
COPY ./docker/entrypoint.node-ubuntu-slim.sh ./
87+
RUN chmod +x ./entrypoint.node-ubuntu-slim.sh
88+
ENTRYPOINT ["./entrypoint.node-ubuntu-slim.sh"]
8989
CMD ["bash"]
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# Build context ignore rules for docker/Dockerfile.24-ubuntu-slim ONLY.
1+
# Build context ignore rules for docker/Dockerfile.node-ubuntu-slim ONLY.
22
#
33
# BuildKit automatically uses this file instead of the repo-root .dockerignore
4-
# when the build targets this Dockerfile (`-f docker/Dockerfile.24-ubuntu-slim`).
4+
# when the build targets this Dockerfile (`-f docker/Dockerfile.node-ubuntu-slim`).
55
# It fully replaces the root .dockerignore (no merge).
66
#
77
# This image is a base image (Ubuntu + Node.js 24 from nodejs.org); it does not
88
# install Matterbridge or use any source. The only thing it copies from the
9-
# context is docker/entrypoint.24-ubuntu-slim.sh, so we ignore everything else.
9+
# context is docker/entrypoint.node-ubuntu-slim.sh, so we ignore everything else.
1010

1111
# Ignore everything...
1212
*
1313

1414
# ...except the single entrypoint this Dockerfile copies.
15-
!docker/entrypoint.24-ubuntu-slim.sh
15+
!docker/entrypoint.node-ubuntu-slim.sh

docker/Dockerfile.ubuntu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM luligu/matterbridge:24-ubuntu-slim
1+
FROM luligu/matterbridge:node-ubuntu-slim
22

33
# 🛠️ Set noninteractive frontend
44
ENV DEBIAN_FRONTEND=noninteractive
@@ -21,7 +21,7 @@ LABEL org.opencontainers.image.title="matterbridge" \
2121
org.opencontainers.image.created=$BUILD_DATE
2222

2323
# Install matterbridge
24-
WORKDIR /matterbridge
24+
WORKDIR /matterbridge
2525
COPY ./.dockerbuild.json ./
2626
RUN \
2727
npm install matterbridge --global --verbose --no-fund --no-audit --omit=dev && \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ echo "🟢 Node.js version: $(node -v)" && \
2525
echo "🟣 Npm version: $(npm -v)"
2626

2727
# Start the main process
28-
exec "$@"
28+
exec "$@"

docs/CHANGELOG.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ <h3 id="added">Added</h3>
174174
</ul>
175175
<h3 id="changed">Changed</h3>
176176
<ul>
177+
<li>[docker]: Rename the <strong>24-ubuntu-slim</strong> base image and its Dockerfile, entrypoint, Docker ignore file, workflow, scripts, and documentation to <strong>node-ubuntu-slim</strong>.</li>
177178
<li>[matterbridge]: Bump <code>matterbridge</code> version to v.3.10.7.</li>
178179
<li>[matterbridge]: Bump <code>@types/bun</code> to v.1.4.0.</li>
179180
<li>[matterbridge]: Bump <code>@vitest/coverage-v8</code> to v.4.1.11.</li>

docs/README-DOCKER.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,11 @@ <h2 id="run-matterbridge-with-docker-and-docker-compose">Run Matterbridge with D
161161
<h3 id="matterbridge-chip-tool-docker-image">Matterbridge chip-tool docker image</h3>
162162
<p>The image (tag <strong>chip-test</strong> 400MB) is based on <code>ubuntu:latest</code> with Node.js 24 LTS from NodeSource and includes the connectedhomeip repository with chip-tool, chip-cert and all components required for yaml and phyton tests. The matterbridge instance inside the container is already paired in the chip-tool fabric to execute yaml tests and in the python harness fabric to execute python tests. In the container, the chip environment and phyton environment are already active. Just open a shell inside the container with bash and run the tests. Matterbridge frontend is as usual on port 8283. No volumes or port mapping needed.</p>
163163
<h3 id="matterbridge-docker-base-images">Matterbridge docker base images</h3>
164-
<p>The image (tag <strong>24-ubuntu-slim</strong> 83 MB) is based on <code>ubuntu:latest</code> with Node.js 24 LTS from NodeSource. It is used to build the <strong>ubuntu</strong> image but can also be used to open a shell in ubuntu latest with node 24 (node doesn&#39;t publish node:24-ubuntu).</p>
165-
<p>The image (tag <strong>bun-ubuntu-slim</strong> 79 MB) is based on <code>ubuntu:latest</code> with Bun from GitHub. It can be used to open a shell in ubuntu latest with Bun.</p>
164+
<p>The image (tag <strong>node-ubuntu-slim</strong> 83 MB) is based on <code>ubuntu:latest</code> with Node.js 24 LTS from NodeSource. It is used to build the <strong>ubuntu</strong> image but can also be used to open a shell in ubuntu latest with node 24 (node doesn&#39;t publish node:24-ubuntu).</p>
165+
<p>The image (tag <strong>bun-ubuntu-slim</strong> 79 MB) is based on <code>ubuntu:latest</code> with Bun from GitHub. It can be used to open a shell in ubuntu latest with Bun (bun doesn&#39;t publish an ubuntu based image).</p>
166+
<h3 id="matterbridge-dev-container-images">Matterbridge Dev Container images</h3>
167+
<p>The image (tag <strong>node-dev-container</strong>) is based on <code>node:24-trixie-slim</code> and provides a development environment for Node.js applications. It includes common development and networking tools, synchronized Bash history, and a non-root <code>node</code> user with passwordless sudo access.</p>
168+
<p>The image (tag <strong>bun-dev-container</strong>) is based on <code>oven/bun:slim</code> and provides a development environment for Bun applications. It includes common development and networking tools, synchronized Bash history, a non-root <code>bun</code> user with passwordless sudo access, and an <code>npm</code> shim that forwards supported commands to Bun.</p>
166169
<h3 id="docker-health-check">Docker health check</h3>
167170
<p>All images include a health check.</p>
168171
<p>How health checks work in different scenarios:</p>

0 commit comments

Comments
 (0)