From 265805914f4c33afc94c3b1d1857a915c29b1877 Mon Sep 17 00:00:00 2001 From: Justin Florentine Date: Mon, 1 Apr 2024 17:38:48 -0400 Subject: [PATCH] reduce number of jvms provided Signed-off-by: Justin Florentine --- docker/graalvm/Dockerfile | 49 -------------------- docker/openj9-jdk-17/Dockerfile | 72 ------------------------------ docker/openjdk-17-debug/Dockerfile | 63 -------------------------- docker/openjdk-17/Dockerfile | 53 ---------------------- 4 files changed, 237 deletions(-) delete mode 100644 docker/graalvm/Dockerfile delete mode 100644 docker/openj9-jdk-17/Dockerfile delete mode 100644 docker/openjdk-17-debug/Dockerfile delete mode 100644 docker/openjdk-17/Dockerfile diff --git a/docker/graalvm/Dockerfile b/docker/graalvm/Dockerfile deleted file mode 100644 index d4009b9c929..00000000000 --- a/docker/graalvm/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ - -FROM ghcr.io/graalvm/graalvm-ce:ol9-java17 -ARG VERSION="dev" - -RUN adduser --home /opt/besu besu && \ - chown besu:besu /opt/besu && \ - chmod 0755 /opt/besu - -USER besu -WORKDIR /opt/besu - -COPY --chown=besu:besu besu /opt/besu/ -RUN chmod -R 755 /opt/besu - -# Expose services ports -# 8545 HTTP JSON-RPC -# 8546 WS JSON-RPC -# 8547 HTTP GraphQL -# 8550 HTTP ENGINE JSON-RPC -# 8551 WS ENGINE JSON-RPC -# 30303 P2P -EXPOSE 8545 8546 8547 8550 8551 30303 - -# defaults for host interfaces -ENV BESU_RPC_HTTP_HOST 0.0.0.0 -ENV BESU_RPC_WS_HOST 0.0.0.0 -ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0 -ENV BESU_PID_PATH "/tmp/pid" - -ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION" - -ENV OLDPATH="${PATH}" -ENV PATH="/opt/besu/bin:${OLDPATH}" - -ENTRYPOINT ["besu"] -HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]" - -# Build-time metadata as defined at http://label-schema.org -ARG BUILD_DATE -ARG VCS_REF -LABEL org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.name="Besu" \ - org.label-schema.description="Enterprise Ethereum client" \ - org.label-schema.url="https://besu.hyperledger.org/" \ - org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url="https://github.com/hyperledger/besu.git" \ - org.label-schema.vendor="Hyperledger" \ - org.label-schema.version=$VERSION \ - org.label-schema.schema-version="1.0" diff --git a/docker/openj9-jdk-17/Dockerfile b/docker/openj9-jdk-17/Dockerfile deleted file mode 100644 index bbbe52cb1eb..00000000000 --- a/docker/openj9-jdk-17/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -FROM ubuntu:22.04 - -ARG VERSION="dev" -ARG TARGETPLATFORM - -RUN apt-get update && \ - apt-get install --no-install-recommends -q --assume-yes curl=7* libjemalloc-dev=5.* && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN ARCH=$(uname -m) && \ - if [ "$ARCH" = "aarch64" ]; then \ - curl -kL -o jdk-17.tar.gz https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz ; \ - elif [ "$(uname -s)" = "Darwin" ] && [ "$(uname -m)" = "arm64" ]; then \ - curl -kL -o jdk-17.tar.gz https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_aarch64_mac_17.0.9_9_openj9-0.41.0.tar.gz ; \ - elif [ "$ARCH" = "x86_64" ]; then \ - curl -kL -o jdk-17.tar.gz https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz ; \ - else \ - echo "Unsupported platform: $ARCH"; exit 1; \ - fi - -RUN tar -xzf jdk-17.tar.gz && \ - rm jdk-17.tar.gz && \ - mv jdk-17.0.9+9-jre /usr/bin/ && \ - update-alternatives --install "/usr/bin/java" "java" "/usr/bin/jdk-17.0.9+9-jre/bin/java" 1 && \ - adduser --disabled-password --gecos "" --home /opt/besu besu && \ - chown besu:besu /opt/besu && \ - chmod 0755 /opt/besu - -ENV JAVA_HOME /usr/bin/jdk-17.0.9+9-jre/ -RUN export JAVA_HOME - -USER besu -WORKDIR /opt/besu - -COPY --chown=besu:besu besu /opt/besu/ - -# Expose services ports -# 8545 HTTP JSON-RPC -# 8546 WS JSON-RPC -# 8547 HTTP GraphQL -# 8550 HTTP ENGINE JSON-RPC -# 8551 WS ENGINE JSON-RPC -# 30303 P2P -EXPOSE 8545 8546 8547 8550 8551 30303 - -# defaults for host interfaces -ENV BESU_RPC_HTTP_HOST 0.0.0.0 -ENV BESU_RPC_WS_HOST 0.0.0.0 -ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0 -ENV BESU_PID_PATH "/tmp/pid" - -ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION" - -ENV OLDPATH="${PATH}" -ENV PATH="/opt/besu/bin:${OLDPATH}" - -ENTRYPOINT ["besu"] -HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]" - -# Build-time metadata as defined at http://label-schema.org -ARG BUILD_DATE -ARG VCS_REF -LABEL org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.name="Besu" \ - org.label-schema.description="Enterprise Ethereum client" \ - org.label-schema.url="https://besu.hyperledger.org/" \ - org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url="https://github.com/hyperledger/besu.git" \ - org.label-schema.vendor="Hyperledger" \ - org.label-schema.version=$VERSION \ - org.label-schema.schema-version="1.0" diff --git a/docker/openjdk-17-debug/Dockerfile b/docker/openjdk-17-debug/Dockerfile deleted file mode 100644 index c08f1ea4b9f..00000000000 --- a/docker/openjdk-17-debug/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ - -FROM ubuntu:22.04 - -ARG VERSION="dev" -RUN apt-get update && \ - apt-get install --no-install-recommends -q --assume-yes ca-certificates-java=20190909* && \ - apt-get install --no-install-recommends -q --assume-yes curl=7* wget=1.21* jq=1.6* net-tools=1.60* openjdk-17-jdk-headless=17* libjemalloc-dev=5.* && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ - adduser --disabled-password --gecos "" --home /opt/besu besu && \ - chown besu:besu /opt/besu && \ - chmod 0755 /opt/besu - -USER besu -WORKDIR /opt/besu - -COPY --chown=besu:besu besu /opt/besu/ - -# Expose services ports -# 5005 JDWP for attaching remote debuggers -# 8545 HTTP JSON-RPC -# 8546 WS JSON-RPC -# 8547 HTTP GraphQL -# 8550 HTTP ENGINE JSON-RPC -# 8551 WS ENGINE JSON-RPC -# 9545 Metrics -# 1098 JMX / JMX-RMI -# 30303 P2P -EXPOSE 5005 8545 8546 8547 8550 8551 9545 1098 30303 - -# defaults for host interfaces -ENV BESU_RPC_HTTP_HOST 0.0.0.0 -ENV BESU_RPC_WS_HOST 0.0.0.0 -ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0 -ENV BESU_METRICS_HOST 0.0.0.0 -ENV BESU_JMX_HOST 0.0.0.0 -ENV BESU_PID_PATH "/tmp/pid" - -#debug options for maximum observability -ENV BESU_LOGGING "INFO" -ENV JDWP_OPTS "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005" -ENV JAVA_OPTS "${JDWP_OPTS} " - -ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION" - -ENV OLDPATH="${PATH}" -ENV PATH="/opt/besu/bin:${OLDPATH}" - -ENTRYPOINT ["besu"] -HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]" - -# Build-time metadata as defined at http://label-schema.org -ARG BUILD_DATE -ARG VCS_REF -LABEL org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.name="Besu" \ - org.label-schema.description="Enterprise Ethereum client" \ - org.label-schema.url="https://besu.hyperledger.org/" \ - org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url="https://github.com/hyperledger/besu.git" \ - org.label-schema.vendor="Hyperledger" \ - org.label-schema.version=$VERSION \ - org.label-schema.schema-version="1.0" diff --git a/docker/openjdk-17/Dockerfile b/docker/openjdk-17/Dockerfile deleted file mode 100644 index bb9f09c410a..00000000000 --- a/docker/openjdk-17/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ - -FROM ubuntu:22.04 -ARG VERSION="dev" - -RUN apt-get update && \ - apt-get install --no-install-recommends -q --assume-yes ca-certificates-java=20190909* && \ - apt-get install --no-install-recommends -q --assume-yes openjdk-17-jre-headless=17* libjemalloc-dev=5.* && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ - adduser --disabled-password --gecos "" --home /opt/besu besu && \ - chown besu:besu /opt/besu && \ - chmod 0755 /opt/besu - -USER besu -WORKDIR /opt/besu - -COPY --chown=besu:besu besu /opt/besu/ - -# Expose services ports -# 8545 HTTP JSON-RPC -# 8546 WS JSON-RPC -# 8547 HTTP GraphQL -# 8550 HTTP ENGINE JSON-RPC -# 8551 WS ENGINE JSON-RPC -# 30303 P2P -EXPOSE 8545 8546 8547 8550 8551 30303 - -# defaults for host interfaces -ENV BESU_RPC_HTTP_HOST 0.0.0.0 -ENV BESU_RPC_WS_HOST 0.0.0.0 -ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0 -ENV BESU_PID_PATH "/tmp/pid" - -ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION" - -ENV OLDPATH="${PATH}" -ENV PATH="/opt/besu/bin:${OLDPATH}" - -ENTRYPOINT ["besu"] -HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]" - -# Build-time metadata as defined at http://label-schema.org -ARG BUILD_DATE -ARG VCS_REF -LABEL org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.name="Besu" \ - org.label-schema.description="Enterprise Ethereum client" \ - org.label-schema.url="https://besu.hyperledger.org/" \ - org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url="https://github.com/hyperledger/besu.git" \ - org.label-schema.vendor="Hyperledger" \ - org.label-schema.version=$VERSION \ - org.label-schema.schema-version="1.0"