From 27f19039f8a75edc69f45a0d0c5667d990ae9140 Mon Sep 17 00:00:00 2001 From: Nadezhda Ryabtsova Date: Sun, 28 Apr 2024 10:36:16 +0300 Subject: [PATCH 1/2] v1.2.2-bookworm-slim --- Dockerfile | 2 +- README.md | 2 +- v1.2.2-bookworm-slim/Dockerfile | 71 +++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 v1.2.2-bookworm-slim/Dockerfile diff --git a/Dockerfile b/Dockerfile index 92e2ab0..16d6654 120000 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1 @@ -v1.2.2-bookworm/Dockerfile \ No newline at end of file +v1.2.2-bookworm-slim/Dockerfile \ No newline at end of file diff --git a/README.md b/README.md index f544cdf..942e5e3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Supported tags and respective `Dockerfile` links * [`latest`](https://github.com/ladamalina/janus-gateway/blob/master/v1.2.2-bookworm/Dockerfile) -* [`v1.2.2-bookworm`](https://github.com/ladamalina/janus-gateway/blob/master/v1.2.2-bookworm/Dockerfile), [`v1.2.1-bookworm`](https://github.com/ladamalina/janus-gateway/blob/master/v1.2.1-bookworm/Dockerfile), [`v1.2.1-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.2.1-bullseye/Dockerfile), [`v1.2.0-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.2.0-bullseye/Dockerfile) +* [`v1.2.2-bookworm`](https://github.com/ladamalina/janus-gateway/blob/master/v1.2.2-bookworm/Dockerfile), [`v1.2.2-bookworm-slim`](https://github.com/ladamalina/janus-gateway/blob/master/v1.2.2-bookworm-slim/Dockerfile), [`v1.2.1-bookworm`](https://github.com/ladamalina/janus-gateway/blob/master/v1.2.1-bookworm/Dockerfile), [`v1.2.1-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.2.1-bullseye/Dockerfile), [`v1.2.0-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.2.0-bullseye/Dockerfile) * [`v1.1.4-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.1.4-bullseye/Dockerfile), [`v1.1.3-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.1.3-bullseye/Dockerfile), [`v1.1.2-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.1.2-bullseye/Dockerfile), [`v1.1.1-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.1.1-bullseye/Dockerfile), [`v1.1.0-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.1.0-bullseye/Dockerfile) * [`v1.0.4-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.0.4-bullseye/Dockerfile), [`v1.0.3-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.0.3-bullseye/Dockerfile), [`v1.0.2-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v1.0.2-bullseye/Dockerfile) * [`v0.14.2-bookworm`](https://github.com/ladamalina/janus-gateway/blob/master/v0.14.2-bookworm/Dockerfile), [`v0.14.1-bookworm`](https://github.com/ladamalina/janus-gateway/blob/master/v0.14.1-bookworm/Dockerfile), [`v0.14.1-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v0.14.1-bullseye/Dockerfile), [`v0.14.0-bullseye`](https://github.com/ladamalina/janus-gateway/blob/master/v0.14.0-bullseye/Dockerfile) diff --git a/v1.2.2-bookworm-slim/Dockerfile b/v1.2.2-bookworm-slim/Dockerfile new file mode 100644 index 0000000..9c54395 --- /dev/null +++ b/v1.2.2-bookworm-slim/Dockerfile @@ -0,0 +1,71 @@ +FROM debian:bookworm-slim + +LABEL maintainer="Nadezhda Ryabtsova " +LABEL description="Provides an image with Janus Gateway" + +RUN echo deb http://deb.debian.org/debian stable main contrib non-free >> /etc/apt/sources.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + git \ + build-essential \ + autoconf \ + automake \ + autotools-dev \ + dh-make \ + debhelper \ + devscripts \ + fakeroot \ + xutils \ + lintian \ + pbuilder \ + libconfig-dev \ + libmicrohttpd-dev \ + libjansson-dev \ + libnice-dev \ + libssl-dev \ + libsrtp2-dev \ + libsofia-sip-ua-dev \ + libglib2.0-dev \ + libopus-dev \ + libogg-dev \ + pkg-config \ + gengetopt \ + libtool \ + automake \ + cmake \ + libmicrohttpd-dev \ + libjansson-dev \ + libcurl4-openssl-dev \ + libglib2.0-dev \ + libssl-dev \ + libopus-dev \ + libavutil-dev \ + libavcodec-dev \ + libavformat-dev \ + libwebsockets-dev \ + liblua5.3-dev && \ + rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /usr/src/libsrtp && \ + cd /usr/src/libsrtp && \ + wget https://github.com/cisco/libsrtp/archive/v2.3.0.tar.gz && \ + tar xfv v2.3.0.tar.gz && \ + cd libsrtp-2.3.0 && \ + ./configure --prefix=/usr --enable-openssl && \ + make shared_library && \ + make install && \ + rm -rf /usr/src/libsrtp + +RUN mkdir -p /usr/src/janus /var/janus/janus/log /var/janus/janus/data && \ + cd /usr/src/janus && \ + wget -c https://github.com/meetecho/janus-gateway/archive/v1.2.2.tar.gz && \ + tar -xzf v1.2.2.tar.gz && \ + cd janus-gateway-1.2.2 && \ + sh autogen.sh && \ + ./configure --prefix=/var/janus/janus --enable-post-processing --disable-rabbitmq --disable-data-channels --disable-aes-gcm && \ + make && make install && make configs && \ + rm -rf /usr/src/janus + +EXPOSE 8088/tcp 8188/tcp 8188/udp + +CMD ["/var/janus/janus/bin/janus", "--nat-1-1=${DOCKER_IP}"] From 9626286b9a88f7d0d3ab3fd6d53fff9972ffefc8 Mon Sep 17 00:00:00 2001 From: Nadezhda Ryabtsova Date: Sun, 28 Apr 2024 10:58:26 +0300 Subject: [PATCH 2/2] Update docker scout actions --- .github/workflows/build-scan-image.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-scan-image.yml b/.github/workflows/build-scan-image.yml index 0c3ac16..c9fff78 100644 --- a/.github/workflows/build-scan-image.yml +++ b/.github/workflows/build-scan-image.yml @@ -43,9 +43,8 @@ jobs: type=semver,pattern=v{{version}} type=sha,prefix=,suffix=,format=short - # Build and push Docker image with Buildx - # (don't push on PR, load instead) - - name: Build and push Docker image + # Build and load Docker image with Buildx (don't push on PR, load instead) + - name: Build and load Docker image id: build-and-push uses: docker/build-push-action@v5 with: