From 3a6b3561399119026acb3a6d1b7f2a50e80b4a50 Mon Sep 17 00:00:00 2001 From: Keiichiro Amemiya Date: Fri, 7 Oct 2022 17:09:09 +0900 Subject: [PATCH 1/6] feat: update rtmp module --- nginx-rtmp-module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-rtmp-module b/nginx-rtmp-module index afd350e..23e1873 160000 --- a/nginx-rtmp-module +++ b/nginx-rtmp-module @@ -1 +1 @@ -Subproject commit afd350e0d8b7820d7d2cfc3fa748217153265ce6 +Subproject commit 23e1873aa62acb58b7881eed2a501f5bf35b82e9 From 8307bdf877981ee3ee70e93ebb6122647a852c8f Mon Sep 17 00:00:00 2001 From: Keiichiro Amemiya Date: Fri, 7 Oct 2022 17:12:08 +0900 Subject: [PATCH 2/6] feat: update alpine and nginx --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 066cff1..ff05ad0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ -FROM alpine:3.12 AS build +FROM alpine:3.16 AS build -ENV NGINX_VERSION 1.19.6 -ENV NGINX_RTMP_VERSION 1.2.1 +ENV NGINX_VERSION 1.23.1 WORKDIR / @@ -20,7 +19,7 @@ RUN make RUN make install -FROM alpine:3.12 +FROM alpine:3.16 RUN apk add --no-cache pcre openssl zlib From e16b27956d9a897455e1e0fef4f1cf7f5fe8dd1d Mon Sep 17 00:00:00 2001 From: Keiichiro Amemiya Date: Fri, 7 Oct 2022 17:25:49 +0900 Subject: [PATCH 3/6] chore: update actions --- .github/workflows/ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36e6f96..62444de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,23 +12,25 @@ jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - - uses: docker/setup-qemu-action@v1 - - uses: docker/setup-buildx-action@v1 - - uses: actions/cache@v2 + - uses: docker/setup-qemu-action@v2 + - uses: docker/setup-buildx-action@v2 + - uses: actions/cache@v3 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} restore-keys: ${{ runner.os }}-buildx- - - uses: crazy-max/ghaction-docker-meta@v1 + - uses: docker/metadata-action@v4 id: docker_meta with: images: | rtainjapan/nginx-rtmp ghcr.io/rtainjapan/nginx-rtmp - tag-sha: true + tags: | + type=sha + type=sha,format=long - uses: docker/login-action@v1 with: username: hoishin From d35fe33129d0996dc6a4ee39d0c8146b831f854e Mon Sep 17 00:00:00 2001 From: Keiichiro Amemiya Date: Fri, 7 Oct 2022 17:30:50 +0900 Subject: [PATCH 4/6] ci: update docker login-action --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62444de..276f833 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,15 +31,15 @@ jobs: tags: | type=sha type=sha,format=long - - uses: docker/login-action@v1 + - uses: docker/login-action@v2 with: username: hoishin password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: docker/login-action@v1 + - uses: docker/login-action@v2 with: registry: ghcr.io - username: hoishin - password: ${{ secrets.CR_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - uses: docker/build-push-action@v2 with: platforms: linux/amd64,linux/arm64 From b04aca7917176d65fb23f7b77d75d88672ddf4fc Mon Sep 17 00:00:00 2001 From: Keiichiro Amemiya Date: Fri, 7 Oct 2022 18:23:55 +0900 Subject: [PATCH 5/6] ci: remove dockerhub --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 276f833..4bb5e38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,15 +26,9 @@ jobs: id: docker_meta with: images: | - rtainjapan/nginx-rtmp ghcr.io/rtainjapan/nginx-rtmp tags: | type=sha - type=sha,format=long - - uses: docker/login-action@v2 - with: - username: hoishin - password: ${{ secrets.DOCKERHUB_TOKEN }} - uses: docker/login-action@v2 with: registry: ghcr.io From e95a1bf72094d3121c7b98c70738791a21ae1d1e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 13:34:07 +0000 Subject: [PATCH 6/6] chore(deps): update docker/build-push-action action to v4 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bb5e38..ece2b2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v2 + - uses: docker/build-push-action@v4 with: platforms: linux/amd64,linux/arm64 push: ${{ github.event_name == 'push' }}