diff --git a/.github/workflows/docker-janus.yml b/.github/workflows/docker-janus.yml index d1ddb8e..01e225a 100644 --- a/.github/workflows/docker-janus.yml +++ b/.github/workflows/docker-janus.yml @@ -15,6 +15,9 @@ on: permissions: contents: read +env: + TEST_TAG: strukturag/nextcloud-spreed-signaling:janus-test + jobs: build: runs-on: ubuntu-latest @@ -29,3 +32,9 @@ jobs: uses: docker/build-push-action@v4 with: context: docker/janus + load: true + tags: ${{ env.TEST_TAG }} + + - name: Test Docker image + run: | + docker run --rm ${{ env.TEST_TAG }} /usr/local/bin/janus --version diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6692e78..f4f1d9e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,6 +9,9 @@ on: permissions: contents: read +env: + TEST_TAG: strukturag/nextcloud-spreed-signaling:test + jobs: server: runs-on: ubuntu-latest @@ -22,6 +25,18 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Build Docker image for testing + uses: docker/build-push-action@v4 + with: + context: . + file: docker/server/Dockerfile + load: true + tags: ${{ env.TEST_TAG }} + + - name: Test Docker image + run: | + docker run --rm ${{ env.TEST_TAG }} /usr/bin/nextcloud-spreed-signaling --version + - name: Build Docker image uses: docker/build-push-action@v4 with: @@ -41,9 +56,21 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Build Docker image for testing + uses: docker/build-push-action@v4 + with: + context: . + file: docker/proxy/Dockerfile + load: true + tags: ${{ env.TEST_TAG }} + + - name: Test Docker image + run: | + docker run --rm ${{ env.TEST_TAG }} /usr/bin/nextcloud-spreed-signaling-proxy --version + - name: Build Docker image uses: docker/build-push-action@v4 with: context: . file: docker/proxy/Dockerfile - platforms: linux/amd64,linux/arm64 \ No newline at end of file + platforms: linux/amd64,linux/arm64 diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile index d043411..7361de3 100644 --- a/docker/proxy/Dockerfile +++ b/docker/proxy/Dockerfile @@ -10,11 +10,13 @@ RUN apt-get -y update && \ if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make proxy -j$(nproc); else \ GOOS=${TARGETOS} GOARCH=${TARGETARCH} make proxy -j$(nproc); fi -FROM alpine:3 +FROM debian:bullseye-slim ENV CONFIG=/config/proxy.conf -RUN adduser -D spreedbackend && \ - apk add --no-cache bash ca-certificates libc6-compat libstdc++ +RUN adduser --system --no-create-home spreedbackend && \ + apt-get update -y && \ + apt-get install -y ca-certificates && \ + rm -rf /var/apt/lists/* COPY --from=builder /workdir/bin/proxy /usr/bin/nextcloud-spreed-signaling-proxy COPY ./proxy.conf.in /config/proxy.conf.in diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index be36ca7..ba1538a 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -11,11 +11,13 @@ RUN apt-get -y update && \ if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make server -j$(nproc); else \ GOOS=${TARGETOS} GOARCH=${TARGETARCH} make server -j$(nproc); fi -FROM alpine:3 +FROM debian:bullseye-slim ENV CONFIG=/config/server.conf -RUN adduser -D spreedbackend && \ - apk add --no-cache bash ca-certificates libc6-compat libstdc++ +RUN adduser --system --no-create-home spreedbackend && \ + apt-get update -y && \ + apt-get install -y ca-certificates && \ + rm -rf /var/apt/lists/* COPY --from=builder /workdir/bin/signaling /usr/bin/nextcloud-spreed-signaling COPY ./server.conf.in /config/server.conf.in