diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 212f443..efa8e34 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,13 +23,13 @@ jobs: - openresty1.13 - lua51 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v6 - name: Build Container - run: docker-compose build ${{ matrix.variant }} + run: docker compose build ${{ matrix.variant }} - name: Lint - run: docker-compose run --rm ${{ matrix.variant }} make lint + run: docker compose run --rm ${{ matrix.variant }} make lint - name: Test - run: docker-compose run --name "${{ matrix.variant }}-test" ${{ matrix.variant }} make test + run: docker compose run --name "${{ matrix.variant }}-test" ${{ matrix.variant }} make test - name: Copy Artifacts if: always() run: | @@ -37,7 +37,7 @@ jobs: docker cp ${{ matrix.variant }}-test:/tmp/resty-auto-ssl-test /tmp/resty-auto-ssl-test - name: Upload Artifacts if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v6 with: name: "${{ matrix.variant }}-logs" path: /tmp/resty-auto-ssl-test diff --git a/Dockerfile-test b/Dockerfile-test index b044892..cfff1d4 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -1,4 +1,4 @@ -FROM openresty/openresty:1.15.8.1-4-centos +FROM openresty/openresty:1.27.1.2-5-centos # Runtime dependencies RUN yum -y install \ diff --git a/Dockerfile-test-alpine b/Dockerfile-test-alpine index 0d2d56d..005b132 100644 --- a/Dockerfile-test-alpine +++ b/Dockerfile-test-alpine @@ -1,4 +1,4 @@ -FROM openresty/openresty:1.15.8.2-1-alpine-fat +FROM openresty/openresty:1.27.1.2-5-alpine-fat RUN mkdir /app WORKDIR /app diff --git a/Dockerfile-test-lua51 b/Dockerfile-test-lua51 index 4509620..c5efd4f 100644 --- a/Dockerfile-test-lua51 +++ b/Dockerfile-test-lua51 @@ -1,4 +1,4 @@ -FROM openresty/openresty:1.11.2.1-centos +FROM openresty/openresty:1.27.1.2-5-centos # Runtime dependencies RUN yum -y install \ diff --git a/Dockerfile-test-openresty1.13 b/Dockerfile-test-openresty1.13 index 3a285d3..f4cbff5 100644 --- a/Dockerfile-test-openresty1.13 +++ b/Dockerfile-test-openresty1.13 @@ -1,4 +1,4 @@ -FROM openresty/openresty:1.13.6.2-2-centos +FROM openresty/openresty:1.27.1.2-5-centos # Runtime dependencies RUN yum -y install \ diff --git a/Dockerfile-test-ubuntu b/Dockerfile-test-ubuntu index fff7566..16edbd7 100644 --- a/Dockerfile-test-ubuntu +++ b/Dockerfile-test-ubuntu @@ -1,4 +1,4 @@ -FROM openresty/openresty:1.15.8.2-1-bionic +FROM openresty/openresty:1.27.1.2-5-noble ENV DEBIAN_FRONTEND noninteractive