Skip to content

Commit

Permalink
Change docker base images from debian to ubuntu (#3171)
Browse files Browse the repository at this point in the history
Change the docker base images from debian (implied by openjdk image) to
ubuntu explicitly. Ubuntu has quicker reaction time to base image
security vulnerabilities.

Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
  • Loading branch information
shemnon authored Dec 14, 2021
1 parent 3ee6bed commit 9cee574
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 13 deletions.
7 changes: 3 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@

## 21.10.4

### Additions and Improvements
- Represent baseFee as Wei instead of long accordingly to the spec [#2785] (https://github.com/hyperledger/besu/issues/2785)

### 21.10.4 Breaking Changes
- Plugin API: BlockHeader.getBaseFee() method now returns an optional Wei instead of an optional Long
- Plugin API: BlockHeader.getBaseFee() method now returns an optional Wei instead of an optional Long [#3065](https://github.com/hyperledger/besu/issues/3065)

### Additions and Improvements
- Represent baseFee as Wei instead of long accordingly to the spec [#2785](https://github.com/hyperledger/besu/issues/2785)
- Adding support of the NO_COLOR environment variable as described in the [NO_COLOR](https://no-color.org/) standard [#3085](https://github.com/hyperledger/besu/pull/3085)
- Add `privx_findFlexiblePrivacyGroup` RPC Method, `privx_findOnchainPrivacyGroup` will be removed in a future release [#3075](https://github.com/hyperledger/besu/pull/3075)
- The invalid value is now shown when `--bootnodes` cannot parse an item to make it easier to identify which option is invalid.
- Adding two new options to be able to specify desired TLS protocol version and Java cipher suites [#3105](https://github.com/hyperledger/besu/pull/3105)
- Implements [EIP-4399](https://eips.ethereum.org/EIPS/eip-4399) to repurpose DIFFICULTY opcode after the merge as a source of entropy from the Beacon chain. [#3081](https://github.com/hyperledger/besu/issues/3081)

### Bug Fixes
- Change the base docker image from Debian Buster to Ubuntu 20.04 [#3171](https://github.com/hyperledger/besu/issues/3171) fixes [#3045](https://github.com/hyperledger/besu/issues/3045)

### Early Access Features
- Add support for additional JWT authentication algorithms [#3017](https://github.com/hyperledger/besu/pull/3017)
Expand Down
4 changes: 2 additions & 2 deletions docker/openjdk-11-debug/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

FROM openjdk:11-slim-buster
FROM ubuntu:20.04

ARG VERSION="dev"
RUN apt-get update && \
apt-get install --no-install-recommends -q --assume-yes curl=7* wget=1.20* jq=1.5* net-tools=1.60* && \
apt-get install --no-install-recommends -q --assume-yes curl=7* wget=1.20* jq=1.6* net-tools=1.60* openjdk-11-jre-headless=11* && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
adduser --disabled-password --gecos "" --home /opt/besu besu && \
Expand Down
9 changes: 6 additions & 3 deletions docker/openjdk-11/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@

FROM openjdk:11-jre-slim-buster

FROM ubuntu:20.04
ARG VERSION="dev"

RUN adduser --disabled-password --gecos "" --home /opt/besu besu && \
RUN apt-get update && \
apt-get install --no-install-recommends -q --assume-yes openjdk-11-jre-headless=11* && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
adduser --disabled-password --gecos "" --home /opt/besu besu && \
chown besu:besu /opt/besu

USER besu
Expand Down
2 changes: 1 addition & 1 deletion docker/openjdk-latest/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM debian:bullseye-slim
FROM ubuntu:20.04
ARG VERSION="dev"

RUN apt-get update && \
Expand Down
11 changes: 8 additions & 3 deletions ethereum/evmtool/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@

FROM openjdk:11.0.7-jre-slim-buster
FROM ubuntu:20.04
ARG VERSION="dev"

RUN adduser --disabled-password --gecos "" --home /opt/besu-evmtool besu && \
chown besu:besu /opt/besu-evmtool
RUN apt-get update && \
apt-get install --no-install-recommends -q --assume-yes openjdk-17-jre-headless=17* && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
adduser --disabled-password --gecos "" --home /opt/besu besu && \
chown besu:besu /opt/besu

USER besu
WORKDIR /opt/besu-evmtool
Expand Down

0 comments on commit 9cee574

Please sign in to comment.