Skip to content

Commit 011195b

Browse files
authoredJun 25, 2024
Merge pull request #1465 from atlassian/release/8.3.0
Release 8.3.0
2 parents 530ee72 + 011378b commit 011195b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+6828
-15856
lines changed
 

‎.gitattributes

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
*.sh text eol=lf
1+
*.sh text eol=lf
2+
dcapt-snapshots.json text eol=lf
3+
*.tfvars text eol=lf

‎Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# bzt run: docker run --shm-size=4g -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt jira.yml
55
# interactive run: docker run -it --entrypoint="/bin/bash" -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt
66

7-
FROM python:3.11-slim-bullseye
7+
FROM python:3.12-slim-bookworm
88

99
ENV APT_INSTALL="apt-get -y install --no-install-recommends"
1010

@@ -14,10 +14,14 @@ ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_c
1414
ENV CHROME_VERSION_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb"
1515

1616
RUN apt-get -y update \
17-
&& $APT_INSTALL vim git openssh-server wget openjdk-11-jdk \
17+
&& $APT_INSTALL vim git openssh-server wget \
1818
&& python -m pip install --upgrade pip \
1919
&& apt-get clean
2020

21+
RUN wget https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.deb \
22+
&& $APT_INSTALL ./jdk-21_linux-x64_bin.deb \
23+
&& rm -rf ./jdk-21_linux-x64_bin.deb
24+
2125
RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_LATEST_URL; else wget -O google-chrome.deb $CHROME_VERSION_URL; fi \
2226
&& $APT_INSTALL ./google-chrome.deb \
2327
&& rm -rf ./google-chrome.deb

0 commit comments

Comments
 (0)
Failed to load comments.