Skip to content

Commit

Permalink
Build modules for NGINX 1.25.5 (#606)
Browse files Browse the repository at this point in the history
* Build modules for NGINX 1.25.5 1.25.5.
* Update docker build to use debian bookworm with a new GPG path.
* Specify same nginx base image for debian and alpine.
  • Loading branch information
miry authored Apr 25, 2024
1 parent fb0521f commit 5fd46eb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
1.25.2,
1.25.3,
1.25.4,
1.25.5,
]
steps:
- name: Checkout Repository
Expand Down
11 changes: 6 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:1.3
ARG BUILD_OS=debian
ARG BUILD_NGINX_VERSION=1.25.5
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx

### Build base image for debian
Expand Down Expand Up @@ -201,15 +202,15 @@ RUN xx-info env && git clone --depth 1 -b $DATADOG_VERSION https://github.com/Da


### Base build image for debian
FROM nginx:1.25.5 as build-nginx-debian
FROM nginx:${BUILD_NGINX_VERSION}-bookworm as build-nginx-debian

RUN echo "deb-src [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list \
RUN echo "deb-src [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
&& apt-get update \
&& apt-get build-dep -y nginx


### Base build image for alpine
FROM nginx:1.25.5-alpine AS build-nginx-alpine
FROM nginx:${BUILD_NGINX_VERSION}-alpine AS build-nginx-alpine
RUN apk add --no-cache \
build-base \
pcre2-dev \
Expand All @@ -236,12 +237,12 @@ RUN curl -fsSL -O https://github.com/nginx/nginx/archive/release-${NGINX_VERSION


### Base image for alpine
FROM nginx:1.25.5-alpine as nginx-alpine
FROM nginx:${BUILD_NGINX_VERSION}-alpine as nginx-alpine
RUN apk add --no-cache libstdc++


### Base image for debian
FROM nginx:1.25.5 as nginx-debian
FROM nginx:${BUILD_NGINX_VERSION}-bookworm as nginx-debian


### Build final image
Expand Down

0 comments on commit 5fd46eb

Please sign in to comment.