Skip to content

Commit ca6a89c

Browse files
kkloberdanzkkloberdanz
authored
3.9.0 Docker Build (#1057)
CXX-2787 - Bump MONGOCXX_VERSION to 3.9.0 - Bump MONGOC_VERSION to 1.25.1 - Bump Red Hat UBI image from 9.2 to 9.3
1 parent d7168c3 commit ca6a89c

File tree

15 files changed

+33
-33
lines changed

15 files changed

+33
-33
lines changed

‎.mci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ functions:
508508
echo "Building Debian Docker image"
509509
make -C extras/docker/bookworm nocachebuild test
510510
echo "Building Red Hat UBI Docker image"
511-
make -C extras/docker/redhat-ubi-9.2 nocachebuild test
511+
make -C extras/docker/redhat-ubi-9.3 nocachebuild test
512512
513513
#######################################
514514
# Post Task #

‎extras/docker/alpine3.18/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
FROM alpine:3.18 AS builder
55

6-
ARG MONGOCXX_VERSION=3.8.1
7-
ARG MONGOC_VERSION=1.24.4
6+
ARG MONGOCXX_VERSION=3.9.0
7+
ARG MONGOC_VERSION=1.25.1
88
ARG MONGOCRYPT_VERSION=1.8.2
99

1010
WORKDIR /build

‎extras/docker/alpine3.18/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# DO NOT EDIT THIS FILE DIRECTLY
22
# This file was auto generated from the template file Makefile.j2 using the generate.py script
33

4-
MONGOCXX_VERSION=3.8.1
4+
MONGOCXX_VERSION=3.9.0
55
DOCKER=docker
66

77
.PHONY: build

‎extras/docker/alpine3.18/TestDockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# DO NOT EDIT THIS FILE DIRECTLY
22
# This file was auto generated from the template file TestDockerfile.j2 using the generate.py script
33

4-
FROM mongodb/mongo-cxx-driver:3.8.1-alpine3.18
4+
FROM mongodb/mongo-cxx-driver:3.9.0-alpine3.18
55

66
WORKDIR /build
77

‎extras/docker/bookworm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
FROM debian:12-slim AS builder
55

6-
ARG MONGOCXX_VERSION=3.8.1
7-
ARG MONGOC_VERSION=1.24.4
6+
ARG MONGOCXX_VERSION=3.9.0
7+
ARG MONGOC_VERSION=1.25.1
88
ARG MONGOCRYPT_VERSION=1.8.2
99

1010
WORKDIR /build

‎extras/docker/bookworm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# DO NOT EDIT THIS FILE DIRECTLY
22
# This file was auto generated from the template file Makefile.j2 using the generate.py script
33

4-
MONGOCXX_VERSION=3.8.1
4+
MONGOCXX_VERSION=3.9.0
55
DOCKER=docker
66

77
.PHONY: build

‎extras/docker/bookworm/TestDockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# DO NOT EDIT THIS FILE DIRECTLY
22
# This file was auto generated from the template file TestDockerfile.j2 using the generate.py script
33

4-
FROM mongodb/mongo-cxx-driver:3.8.1-bookworm
4+
FROM mongodb/mongo-cxx-driver:3.9.0-bookworm
55

66
WORKDIR /build
77

‎extras/docker/generate.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from jinja2 import FileSystemLoader
55

66

7-
MONGOCXX_VERSION = "3.8.1"
8-
MONGOC_VERSION = "1.24.4"
7+
MONGOCXX_VERSION = "3.9.0"
8+
MONGOC_VERSION = "1.25.1"
99
MONGOCRYPT_VERSION = "1.8.2"
1010

1111

@@ -27,37 +27,37 @@ def render_template(template_filename, context):
2727
"alpine3.18",
2828
"bookworm",
2929
"jammy",
30-
"redhat-ubi-9.2",
30+
"redhat-ubi-9.3",
3131
]
3232
base_image = {
3333
"alpine3.18": "alpine:3.18",
3434
"bookworm": "debian:12-slim",
3535
"jammy": "ubuntu:22.04",
36-
"redhat-ubi-9.2": "registry.access.redhat.com/ubi9/ubi-minimal:9.2",
36+
"redhat-ubi-9.3": "registry.access.redhat.com/ubi9/ubi-minimal:9.3",
3737
}
3838
test_dependency_install_command = {
3939
"alpine3.18": "apk update && apk upgrade && apk add --no-cache alpine-sdk",
4040
"bookworm": "apt update && apt upgrade -y && apt install -y build-essential",
4141
"jammy": "apt update && apt upgrade -y && apt install -y build-essential",
42-
"redhat-ubi-9.2": "microdnf upgrade -y && microdnf install -y g++",
42+
"redhat-ubi-9.3": "microdnf upgrade -y && microdnf install -y g++",
4343
}
4444
build_dependencies_install_command = {
4545
"alpine3.18": "apk update && apk upgrade && apk add --no-cache alpine-sdk ninja cmake openssl-dev python3",
4646
"bookworm": "apt update && apt upgrade -y && apt install -y ninja-build build-essential cmake git libssl-dev python3 wget",
4747
"jammy": "apt update && apt upgrade -y && apt install -y ninja-build build-essential cmake git libssl-dev python3 wget",
48-
"redhat-ubi-9.2": "microdnf upgrade -y && microdnf install -y ninja-build gcc g++ git gzip tar wget cmake openssl-devel python3",
48+
"redhat-ubi-9.3": "microdnf upgrade -y && microdnf install -y ninja-build gcc g++ git gzip tar wget cmake openssl-devel python3",
4949
}
5050
runtime_dependencies_install_command = {
5151
"alpine3.18": "apk update && apk upgrade && apk add --no-cache openssl3 libstdc++ libc6-compat",
5252
"bookworm": "apt update && apt upgrade -y && apt install -y libssl3 && rm -rf /var/lib/apt/lists/*",
5353
"jammy": "apt update && apt upgrade -y && apt install -y libssl3 && rm -rf /var/lib/apt/lists/*",
54-
"redhat-ubi-9.2": "microdnf upgrade -y && microdnf install -y openssl",
54+
"redhat-ubi-9.3": "microdnf upgrade -y && microdnf install -y openssl",
5555
}
5656
post_install_commands = {
5757
"alpine3.18": "",
5858
"bookworm": "\nRUN ldconfig\n",
5959
"jammy": "\nRUN ldconfig\n",
60-
"redhat-ubi-9.2": (
60+
"redhat-ubi-9.3": (
6161
"\n"
6262
"RUN ldconfig\n"
6363
"\n"

‎extras/docker/jammy/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
FROM ubuntu:22.04 AS builder
55

6-
ARG MONGOCXX_VERSION=3.8.1
7-
ARG MONGOC_VERSION=1.24.4
6+
ARG MONGOCXX_VERSION=3.9.0
7+
ARG MONGOC_VERSION=1.25.1
88
ARG MONGOCRYPT_VERSION=1.8.2
99

1010
WORKDIR /build

‎extras/docker/jammy/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# DO NOT EDIT THIS FILE DIRECTLY
22
# This file was auto generated from the template file Makefile.j2 using the generate.py script
33

4-
MONGOCXX_VERSION=3.8.1
4+
MONGOCXX_VERSION=3.9.0
55
DOCKER=docker
66

77
.PHONY: build

‎extras/docker/jammy/TestDockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# DO NOT EDIT THIS FILE DIRECTLY
22
# This file was auto generated from the template file TestDockerfile.j2 using the generate.py script
33

4-
FROM mongodb/mongo-cxx-driver:3.8.1-jammy
4+
FROM mongodb/mongo-cxx-driver:3.9.0-jammy
55

66
WORKDIR /build
77

‎extras/docker/redhat-ubi-9.2/Dockerfile renamed to ‎extras/docker/redhat-ubi-9.3/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# DO NOT EDIT THIS FILE DIRECTLY
22
# This file was auto generated from the template file Dockerfile.j2 using the generate.py script
33

4-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.2 AS builder
4+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.3 AS builder
55

6-
ARG MONGOCXX_VERSION=3.8.1
7-
ARG MONGOC_VERSION=1.24.4
6+
ARG MONGOCXX_VERSION=3.9.0
7+
ARG MONGOC_VERSION=1.25.1
88
ARG MONGOCRYPT_VERSION=1.8.2
99

1010
WORKDIR /build
@@ -60,7 +60,7 @@ RUN wget https://github.com/mongodb/mongo-cxx-driver/archive/refs/tags/r${MONGOC
6060
cmake --build mongocxx-build --config RelWithDebInfo && \
6161
cmake --install mongocxx-build --config RelWithDebInfo --prefix /opt/mongocxx
6262

63-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.2
63+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.3
6464

6565
RUN microdnf upgrade -y && microdnf install -y openssl
6666

‎extras/docker/redhat-ubi-9.2/Makefile renamed to ‎extras/docker/redhat-ubi-9.3/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# DO NOT EDIT THIS FILE DIRECTLY
22
# This file was auto generated from the template file Makefile.j2 using the generate.py script
33

4-
MONGOCXX_VERSION=3.8.1
4+
MONGOCXX_VERSION=3.9.0
55
DOCKER=docker
66

77
.PHONY: build
88
build:
99
$(DOCKER) build . \
10-
-t mongodb/mongo-cxx-driver:$(MONGOCXX_VERSION)-redhat-ubi-9.2
10+
-t mongodb/mongo-cxx-driver:$(MONGOCXX_VERSION)-redhat-ubi-9.3
1111

1212
.PHONY: nocachebuild
1313
nocachebuild:
1414
$(DOCKER) build . \
1515
--no-cache \
16-
-t mongodb/mongo-cxx-driver:$(MONGOCXX_VERSION)-redhat-ubi-9.2
16+
-t mongodb/mongo-cxx-driver:$(MONGOCXX_VERSION)-redhat-ubi-9.3
1717

1818
.PHONY: run
1919
run: | $(filter nocachebuild build, $(MAKECMDGOALS))
20-
$(DOCKER) run --rm -it mongodb/mongo-cxx-driver:$(MONGOCXX_VERSION)-redhat-ubi-9.2
20+
$(DOCKER) run --rm -it mongodb/mongo-cxx-driver:$(MONGOCXX_VERSION)-redhat-ubi-9.3
2121

2222
.PHONY: test
2323
test: | $(filter nocachebuild build, $(MAKECMDGOALS))
24-
$(DOCKER) build . --no-cache -f TestDockerfile -t test-mongocxx-driver-image:$(MONGOCXX_VERSION)-redhat-ubi-9.2
25-
$(DOCKER) run test-mongocxx-driver-image:$(MONGOCXX_VERSION)-redhat-ubi-9.2
24+
$(DOCKER) build . --no-cache -f TestDockerfile -t test-mongocxx-driver-image:$(MONGOCXX_VERSION)-redhat-ubi-9.3
25+
$(DOCKER) run test-mongocxx-driver-image:$(MONGOCXX_VERSION)-redhat-ubi-9.3

‎extras/docker/redhat-ubi-9.2/TestDockerfile renamed to ‎extras/docker/redhat-ubi-9.3/TestDockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# DO NOT EDIT THIS FILE DIRECTLY
22
# This file was auto generated from the template file TestDockerfile.j2 using the generate.py script
33

4-
FROM mongodb/mongo-cxx-driver:3.8.1-redhat-ubi-9.2
4+
FROM mongodb/mongo-cxx-driver:3.9.0-redhat-ubi-9.3
55

66
WORKDIR /build
77

‎extras/docker/redhat-ubi-9.2/test.cpp renamed to ‎extras/docker/redhat-ubi-9.3/test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
int main(void) {
1010
mongocxx::instance inst{};
1111
std::cout << "mongo-cxx-driver version: " << MONGOCXX_VERSION_STRING << std::endl;
12-
std::cout << "THE redhat-ubi-9.2 IMAGE WORKS!" << std::endl;
12+
std::cout << "THE redhat-ubi-9.3 IMAGE WORKS!" << std::endl;
1313
}

0 commit comments

Comments
 (0)