Skip to content

Commit

Permalink
Remove sid from bullseye docker images
Browse files Browse the repository at this point in the history
 Use temurin for jdk8 instead

 patch by Mick Semb Wever; reviewed by Brandon Williams, Maxim Muzafarov for CASSANDRA-19708
  • Loading branch information
michaelsembwever committed Jun 17, 2024
1 parent 6c31b47 commit f78b888
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions docker/bullseye-image.docker
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,24 @@ RUN echo 'Acquire::http::Timeout "60";' > /etc/apt/apt.conf.d/80proxy.conf
RUN echo 'Acquire::ftp::Timeout "60";' >> /etc/apt/apt.conf.d/80proxy.conf

# install deps
RUN until apt-get update && apt-get -y install ant build-essential curl devscripts ed git python2 sudo ; \
RUN until apt-get update \
&& apt-get -y install ant build-essential curl devscripts ed git python2 sudo apt-transport-https gpg ; \
do echo "apt failed… trying again in 10s… " ; sleep 10 ; done

RUN echo 'deb http://deb.debian.org/debian sid main' >> /etc/apt/sources.list
RUN until apt-get install -y --no-install-recommends openjdk-11-jdk openjdk-17-jdk ; \
do echo "apt failed… trying again in 10s… " ; sleep 10 ; done

RUN until apt-get update \
&& apt-get install -y --no-install-recommends openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk ; \
# jdk8 from adoptium
RUN curl -s https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor \
| tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null

RUN echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" \
| tee /etc/apt/sources.list.d/adoptium.list

RUN until apt-get update && apt-get install -y temurin-8-jdk ; \
do echo "apt failed… trying again in 10s… " ; sleep 10 ; done

RUN update-java-alternatives --set java-1.8.0-openjdk-$(dpkg --print-architecture)
RUN update-java-alternatives --set temurin-8-jdk-$(dpkg --print-architecture)

# dh-python is incompatible with python-is-python2, so we'll link it ourselves
RUN ln -s /usr/bin/python2 /usr/bin/python
Expand Down

0 comments on commit f78b888

Please sign in to comment.