Skip to content

[pull] main from zaproxy:main #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Feb 26, 2026
+8 −5
Merged

[pull] main from zaproxy:main #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25884f5
Docker: Update weekly image to debian:trixie and JDK 21
psiinon Feb 26, 2026
85446f0
Merge pull request #9260 from psiinon/docker/jdk21-weekly
kingthorin Feb 26, 2026
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
3 changes: 3 additions & 0 deletions docker/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog
All notable changes to the docker containers will be documented in this file.

### 2026-02-26
- Updated weekly image to debian:trixie and JDK 21

### 2026-02-25
- Updated live image to debian:trixie and JDK 21

Expand Down
10 changes: 5 additions & 5 deletions docker/Dockerfile-weekly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
# This dockerfile builds the zap weekly release
FROM --platform=linux/amd64 debian:bookworm-slim AS builder
FROM --platform=linux/amd64 debian:trixie-slim AS builder
RUN apt-get update && apt-get install -q -y --fix-missing \
wget \
curl \
Expand All @@ -21,7 +21,7 @@ RUN --mount=type=secret,id=webswing_url \
# Remove Webswing bundled examples
rm -Rf webswing/apps/

FROM debian:bookworm-slim AS final
FROM debian:trixie-slim AS final
LABEL maintainer="psiinon@gmail.com"

ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -q -y --fix-missing \
automake \
autoconf \
gcc g++ \
openjdk-17-jdk \
openjdk-21-jdk \
wget \
curl \
xmlstarlet \
Expand All @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -q -y --fix-missing \
mkdir /zap && \
chown zap:zap /zap

RUN pip3 install --break-system-packages --no-cache-dir --upgrade awscli pip zaproxy pyyaml requests urllib3
RUN pip install --break-system-packages --no-cache-dir --upgrade awscli zaproxy pyyaml requests urllib3

WORKDIR /zap

Expand All @@ -67,7 +67,7 @@ RUN curl -s https://raw.githubusercontent.com/zaproxy/zap-admin/master/ZapVersio
rm -R ZAP*

ARG TARGETARCH
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-$TARGETARCH
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-$TARGETARCH
ENV PATH=$JAVA_HOME/bin:/zap/:$PATH
ENV ZAP_PATH=/zap/zap.sh

Expand Down
Loading