Skip to content

Commit d6c1ada

Browse files
committed
upgrade ubuntu 24.04 and nginx 1.26.2
1 parent 5def0a0 commit d6c1ada

File tree

5 files changed

+67
-327
lines changed

5 files changed

+67
-327
lines changed

Dockerfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
FROM ubuntu:22.04 AS buildstep
1+
FROM ubuntu:24.04 AS buildstep
22
ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
3-
NGINX_DEVEL_KIT_VERSION=0.3.2 NGINX_SET_MISC_MODULE_VERSION=0.33 \
4-
NGINX_VERSION=1.24.0
3+
NGINX_DEVEL_KIT_VERSION=0.3.3 NGINX_SET_MISC_MODULE_VERSION=0.33 \
4+
NGINX_VERSION=1.26.2
55
ADD ./build/ /tmp/
66
RUN bash /tmp/ubuntu.sh
77

88

9-
FROM ubuntu:22.04
9+
FROM ubuntu:24.04
1010
LABEL maintainer="noogen <[email protected]>"
1111
ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
12-
NGINX_VERSION=_1.24.0-1~jammy_amd64.deb \
13-
NGINX_DEBUG=-dbg${NGINX_VERSION}
12+
NGINX_VERSION=_1.26.2-1~noble_arm64.deb
1413

1514
COPY --from=buildstep /usr/src/nginx/nginx${NGINX_VERSION} /tmp
1615

@@ -24,8 +23,8 @@ RUN cd /tmp \
2423
&& touch /var/log/cron.log \
2524
&& curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add - \
2625
&& cp /etc/apt/sources.list /etc/apt/sources.list.bak \
27-
&& echo "deb http://nginx.org/packages/ubuntu/ jammy nginx" | tee -a /etc/apt/sources.list \
28-
&& echo "deb-src http://nginx.org/packages/ubuntu/ jammy nginx" | tee -a /etc/apt/sources.list \
26+
&& echo "deb http://nginx.org/packages/ubuntu/ noble nginx" | tee -a /etc/apt/sources.list \
27+
&& echo "deb-src http://nginx.org/packages/ubuntu/ noble nginx" | tee -a /etc/apt/sources.list \
2928
&& apt-get update -y \
3029
&& dpkg -i nginx${NGINX_VERSION} \
3130
&& apt-get install --no-install-recommends --no-install-suggests -y nginx-module-njs gettext-base \
@@ -34,7 +33,7 @@ RUN cd /tmp \
3433
&& ln -sf /dev/stdout /var/log/nginx/access.log \
3534
&& ln -sf /dev/stderr /var/log/nginx/error.log \
3635
&& service nginx stop && update-rc.d -f nginx disable \
37-
&& pip3 install requests boto3 \
36+
&& pip3 install requests boto3 --break-system-packages \
3837
&& apt-get clean -y && apt-get autoclean -y \
3938
&& apt-get autoremove --purge -y \
4039
&& rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*

build/ubuntu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ rm ngx-misc.tar.gz
2525

2626
curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add -
2727
cp /etc/apt/sources.list /etc/apt/sources.list.bak
28-
echo "deb http://nginx.org/packages/ubuntu/ jammy nginx" | tee -a /etc/apt/sources.list
29-
echo "deb-src http://nginx.org/packages/ubuntu/ jammy nginx" | tee -a /etc/apt/sources.list
28+
echo "deb http://nginx.org/packages/ubuntu/ noble nginx" | tee -a /etc/apt/sources.list
29+
echo "deb-src http://nginx.org/packages/ubuntu/ noble nginx" | tee -a /etc/apt/sources.list
3030

3131
apt-get update && apt-get upgrade -y --no-install-recommends --no-install-suggests
3232

0 commit comments

Comments
 (0)