Skip to content

[pull] main from zaproxy:main #130

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 25, 2026
Merged

[pull] main from zaproxy:main #130

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
8788099
Docker: Update live image to debian:trixie and JDK 21
psiinon Feb 25, 2026
6dd25f9
Merge pull request #9259 from psiinon/docker/jdk21-live
kingthorin Feb 25, 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-25
- Updated live image to debian:trixie and JDK 21

### 2026-02-09
- Added support for the delay job in the baseline

Expand Down
13 changes: 6 additions & 7 deletions docker/Dockerfile-live
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# syntax=docker/dockerfile:1
# This dockerfile builds a 'live' zap docker image using the latest files in the repos
FROM --platform=linux/amd64 debian:bookworm-slim AS builder
FROM --platform=linux/amd64 debian:trixie-slim AS builder

ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -q -y --fix-missing \
openjdk-17-jdk \
openjdk-21-jdk \
wget \
curl \
unzip \
Expand Down Expand Up @@ -34,7 +34,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 @@ -45,7 +45,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 @@ -67,12 +67,11 @@ RUN apt-get update && apt-get install -q -y --fix-missing \
mkdir /zap && \
chown zap:zap /zap

RUN pip3 install \
RUN pip install \
--break-system-packages \
--no-cache-dir \
--upgrade \
awscli \
pip \
zaproxy \
pyyaml \
requests \
Expand All @@ -84,7 +83,7 @@ USER zap
RUN mkdir /home/zap/.vnc

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