Skip to content

Commit

Permalink
Upgrade docker to latest lts (Consensys#8366)
Browse files Browse the repository at this point in the history
  • Loading branch information
tbenr authored Jun 11, 2024
1 parent 0210e42 commit f0ff5f0
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ the [releases page](https://github.com/Consensys/teku/releases).
- Added rest api endpoint `/teku/v1/beacon/state/finalized/slot/before/{slot}` to return most recent stored state at or before a specified slot.
- The validator client will start using the `v2` variant of the beacon node block publishing
endpoints. In the cases where the block has been produced in the same beacon node, only equivocation validation will be done instead of the entire gossip validation.
- Docker images are now based on ubuntu 24.04 LTS (noble)

### Bug Fixes
- Fixed performance degradation introduced in 24.4.0 regarding archive state retrieval time.
Expand Down
13 changes: 10 additions & 3 deletions docker/jdk17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,20 @@ RUN JAVA_TOOL_OPTIONS="-Djdk.lang.Process.launchMechanism=vfork" $JAVA_HOME/bin/
--compress=2 \
--output /javaruntime

FROM ubuntu:22.04
FROM ubuntu:24.04
ENV JAVA_HOME=/opt/java/openjdk
ENV PATH "${JAVA_HOME}/bin:${PATH}"
COPY --from=jre-build /javaruntime $JAVA_HOME

RUN apt-get -y update && apt-get -y upgrade && apt-get -y install curl libc-bin libc6 && rm -rf /var/lib/apt/lists/*
RUN adduser --disabled-password --gecos "" --home /opt/teku teku && \
RUN apt-get -y update && apt-get -y upgrade && apt-get -y install curl libc-bin libc6 adduser && \
# Clean apt cache
apt-get clean && \
rm -rf /var/cache/apt/archives/* && \
rm -rf /var/lib/apt/lists/*

# Ubuntu 23.10 and above comes with an "ubuntu" user with uid 1000. We need 1000 for teku.
RUN userdel ubuntu 2>/dev/null || true && rm -rf /home/ubuntu && \
adduser --uid 1000 --disabled-password --gecos "" --home /opt/teku teku && \
chown teku:teku /opt/teku && \
chmod 0755 /opt/teku

Expand Down
13 changes: 10 additions & 3 deletions docker/jdk21/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,20 @@ RUN JAVA_TOOL_OPTIONS="-Djdk.lang.Process.launchMechanism=vfork" $JAVA_HOME/bin/
--compress=2 \
--output /javaruntime

FROM ubuntu:22.04
FROM ubuntu:24.04
ENV JAVA_HOME=/opt/java/openjdk
ENV PATH "${JAVA_HOME}/bin:${PATH}"
COPY --from=jre-build /javaruntime $JAVA_HOME

RUN apt-get -y update && apt-get -y upgrade && apt-get -y install curl libc-bin libc6 && rm -rf /var/lib/apt/lists/*
RUN adduser --disabled-password --gecos "" --home /opt/teku teku && \
RUN apt-get -y update && apt-get -y upgrade && apt-get -y install curl libc-bin libc6 adduser && \
# Clean apt cache
apt-get clean && \
rm -rf /var/cache/apt/archives/* && \
rm -rf /var/lib/apt/lists/*

# Ubuntu 23.10 and above comes with an "ubuntu" user with uid 1000. We need 1000 for teku.
RUN userdel ubuntu 2>/dev/null || true && rm -rf /home/ubuntu && \
adduser --uid 1000 --disabled-password --gecos "" --home /opt/teku teku && \
chown teku:teku /opt/teku && \
chmod 0755 /opt/teku

Expand Down

0 comments on commit f0ff5f0

Please sign in to comment.