diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36e6f96..ece2b2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,33 +12,29 @@ 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 - - uses: docker/login-action@v1 - with: - username: hoishin - password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: docker/login-action@v1 + tags: | + type=sha + - uses: docker/login-action@v2 with: registry: ghcr.io - username: hoishin - password: ${{ secrets.CR_TOKEN }} - - uses: docker/build-push-action@v2 + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - uses: docker/build-push-action@v4 with: platforms: linux/amd64,linux/arm64 push: ${{ github.event_name == 'push' }} 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 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