Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ jobs:
run: docker compose run --rm dev make bench-quick

- name: Upload benchmark artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: bench-results-nginx-${{ matrix.nginx_version }}
if-no-files-found: error
path: |
bench/results/latest/summary.json
bench/results/latest/summary.txt
bench/results/latest/*.json
bench/results/latest/*.log
if-no-files-found: error
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ jobs:
uses: actions/upload-artifact@v7
with:
name: debian-package-artifacts
if-no-files-found: error
include-hidden-files: true
path: |
.pkg-build/libnginx-mod-http-cache-pilot_*.buildinfo
.pkg-build/libnginx-mod-http-cache-pilot_*.changes
.pkg-build/libnginx-mod-http-cache-pilot_*.deb
.pkg-build/libnginx-mod-http-cache-pilot_*.dsc
.pkg-build/libnginx-mod-http-cache-pilot_*.tar.*
if-no-files-found: error
6 changes: 4 additions & 2 deletions .github/workflows/publish-launchpad-ppa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ permissions:

jobs:
source-tarball:
name: Build source tarball
runs-on: ubuntu-24.04

steps:
Expand All @@ -34,6 +35,7 @@ jobs:
uses: actions/upload-artifact@v7
with:
name: launchpad-orig-tarball
include-hidden-files: true
path: .pkg-build/libnginx-mod-http-cache-pilot_*.orig.tar.gz
if-no-files-found: error

Expand Down Expand Up @@ -81,13 +83,13 @@ jobs:

- name: Upload source package artifacts
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: launchpad-source-${{ matrix.series }}
if-no-files-found: error
include-hidden-files: true
path: |
.pkg-build/libnginx-mod-http-cache-pilot_*.buildinfo
.pkg-build/libnginx-mod-http-cache-pilot_*.changes
.pkg-build/libnginx-mod-http-cache-pilot_*.dsc
.pkg-build/libnginx-mod-http-cache-pilot_*.tar.*
if-no-files-found: error
22 changes: 15 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ FROM debian:bookworm-slim
LABEL org.opencontainers.image.source="https://github.com/wpelevator/ngx_cache_pilot"
LABEL org.opencontainers.image.description="Debian development environment for ngx_cache_pilot"

ARG NGINX_VERSION=1.25.5

ENV DEBIAN_FRONTEND=noninteractive
ENV NGINX_VERSION=${NGINX_VERSION}
ENV NGINX_SRC_DIR=/opt/nginx-src/nginx-${NGINX_VERSION}
ENV NGINX_BUILD_PREFIX=/opt/nginx
ENV PATH=${NGINX_BUILD_PREFIX}/sbin:${PATH}

# Perl packages below are dependencies for openresty/test-nginx.
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
astyle \
Expand All @@ -23,18 +20,29 @@ RUN apt-get update \
git \
libpcre3-dev \
libssl-dev \
libipc-run-perl \
liblist-moreutils-perl \
libtest-base-perl \
libtest-longstring-perl \
libtext-diff-perl \
liburi-perl \
libwww-perl \
perl \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/*

RUN git clone --depth=1 --branch v0.32 https://github.com/openresty/test-nginx.git /opt/test-nginx \
&& cpanm --notest /opt/test-nginx

ARG NGINX_VERSION=1.25.5
ENV NGINX_VERSION=${NGINX_VERSION}
ENV NGINX_SRC_DIR=/opt/nginx-src/nginx-${NGINX_VERSION}

RUN mkdir -p /opt/nginx-src \
&& curl -fsSLo /tmp/nginx.tar.gz "https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" \
&& tar -xzf /tmp/nginx.tar.gz -C /opt/nginx-src \
&& rm /tmp/nginx.tar.gz

RUN git clone --depth=1 --branch v0.32 https://github.com/openresty/test-nginx.git /opt/test-nginx \
&& cpanm --notest /opt/test-nginx

RUN cd "${NGINX_SRC_DIR}" \
&& ./configure \
--prefix="${NGINX_BUILD_PREFIX}" \
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
dev:
image: ghcr.io/wpelevator/ngx-cache-pilot--dev:${NGINX_VERSION:-1.25.5}
image: ghcr.io/wpelevator/ngx-cache-pilot--dev:1.0.0-nginx-${NGINX_VERSION:-1.25.5}
build:
context: .
args:
Expand All @@ -9,7 +9,7 @@ services:
volumes:
- .:/workspace
packaging:
image: ghcr.io/wpelevator/ngx-cache-pilot--packaging:1.0.1
image: ghcr.io/wpelevator/ngx-cache-pilot--packaging:1.0.2
build:
context: .
dockerfile: Dockerfile.packaging
Expand Down
Loading