Update the default version of the Dockerfile and remove 6.3 (#12158)

* Update the default version of the Dockerfile and remove 6.3

Author: johscheuer

packaging/docker/Dockerfile

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM docker.io/rockylinux/rockylinux:9.4-minimal AS base
+FROM docker.io/rockylinux/rockylinux:9.5-minimal AS base
 
 RUN microdnf install -y \
     bind-utils \
@@ -57,11 +57,14 @@ RUN curl -Ls "https://github.com/krallin/tini/releases/download/v0.19.0/tini-$TA
 
 WORKDIR /
 
-FROM docker.io/library/golang:1.23.8-bullseye AS go-build
-
+FROM docker.io/library/golang:1.23.9-bookworm AS go-build
 COPY fdbkubernetesmonitor/ /fdbkubernetesmonitor
 WORKDIR /fdbkubernetesmonitor
 RUN go build -o /fdb-kubernetes-monitor *.go
+
+# Build the fdb-aws-s3-credentials-fetcher in a dedicated build as we don't want to build this image
+# on a regular base until we have a release plan for it.
+FROM go-build AS go-credentials-fetcher-build
 COPY fdb-aws-s3-credentials-fetcher/ /fdb-aws-s3-credentials-fetcher
 WORKDIR /fdb-aws-s3-credentials-fetcher
 RUN go build -o /fdb-aws-s3-credentials-fetcher *.go
@@ -75,12 +78,11 @@ RUN groupadd --gid 4059 fdb && \
             --no-create-home \
             --shell /bin/bash fdb
 USER fdb
-COPY --from=go-build /fdb-aws-s3-credentials-fetcher /usr/bin/
+COPY --from=go-credentials-fetcher-build /fdb-aws-s3-credentials-fetcher /usr/bin/
 ENTRYPOINT ["/usr/bin/fdb-aws-s3-credentials-fetcher", "-dir", "/var/fdb"]
 
 FROM base AS foundationdb-base
-
-ARG FDB_VERSION=6.3.22
+ARG FDB_VERSION=7.3.63
 ARG FDB_LIBRARY_VERSIONS="${FDB_VERSION}"
 ARG FDB_WEBSITE=https://github.com/apple/foundationdb/releases/download
 
@@ -228,7 +230,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
 
 # TODO: Log4J complains that it's eating the HTracer logs.  Even without it, we get per-operation
 # time series graphs of throughput, median, 90, 99, 99.9 and 99.99 (in usec).
-COPY run_ycsb.sh run_ycsb_standalone.sh /usr/local/bin
+COPY run_ycsb.sh run_ycsb_standalone.sh /usr/local/bin/
 RUN mkdir -p /var/log/fdb-trace-logs && \
     chmod +x /usr/local/bin/run_ycsb.sh && \
     chmod +x /usr/local/bin/run_ycsb_standalone.sh

packaging/docker/README.md

@@ -1,13 +1,30 @@
 # packaging/docker
-This directory contains the pieces for building FoundationDB docker images. 
+
+This directory contains the pieces for building FoundationDB docker images.
 
 `build-images.sh` will optionally take a single parameter that will be used as an
 image tag postfix.
 
 For more details it is best to read the `build-images.sh` shell script itself to
-learn more about how the images are built. 
+learn more about how the images are built.
+
+For details about what is in the images, peruse `Dockerfile`
+
+the `samples` directory is out of date, and anything therein should be used with
+the expectation that it is, at least, partially (if not entirely) incorrect.
+
+## Building images locally without the script
+
+If you only want to build a custom container image based on an alrady released FDB version you run the following command from the root:
+
+```bash
+export FDB_VERSION=7.3.63
+docker build --build-arg FDB_VERSION=${FDB_VERSION} -t ${REGISTRY}/foundationdb/fdb-kubernetes-monitor:${FDB_VERSION} --target fdb-kubernetes-monitor -f ./packaging/docker/Dockerfile .
+```
 
-For details about what is in the images, peruse `Dockerfile{,.eks}`
+Or if you want to build the `foundationdb` image and not the `fdb-kubernetes-monitor`:
 
-the `samples` directory is out of date, and anything therein should be used with 
-the expectation that it is, at least, partially (if not entirely) incorrect. 
+```bash
+export FDB_VERSION=7.3.63
+docker build --build-arg FDB_VERSION=${FDB_VERSION} -t ${REGISTRY}/foundationdb/foundationdb:${FDB_VERSION} --target foundationdb -f ./packaging/docker/Dockerfile .
+```

packaging/docker/build-images.sh

@@ -250,7 +250,7 @@ build_output_directory="${script_dir}/../../"
 source_code_diretory=$(awk -F= '/foundationdb_SOURCE_DIR:STATIC/{print $2}' "${build_output_directory}/CMakeCache.txt")
 commit_sha=$(cd "${source_code_diretory}" && git rev-parse --verify HEAD --short=10)
 fdb_version=$(cat "${build_output_directory}/version.txt")
-fdb_library_versions=( '6.3.25' '7.1.57' '7.3.37' "${fdb_version}" )
+fdb_library_versions=( '7.3.63' "${fdb_version}" )
 fdb_website="https://github.com/apple/foundationdb/releases/download"
 image_list=(
     'base'