Skip to content

Commit f66f6ca

Browse files
author
ci bot
committed
Merge branch 'upgrades' into 'enterprise'
fix: upgrade base image and package versions See merge request dkinternal/observability/dataops-observability!47
2 parents 3076b37 + a250d32 commit f66f6ca

File tree

4 files changed

+1197
-1135
lines changed

4 files changed

+1197
-1135
lines changed

deploy/docker/observability-be.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DEV NOTE: YOU MUST RUN `docker build` FROM THE TOP-LEVEL OF `observability-be` AND POINT TO THIS FILE.
22
ARG BASE_IMAGE_URL
3-
FROM ${BASE_IMAGE_URL}python:3.12.10-alpine3.20 AS build-image
3+
FROM ${BASE_IMAGE_URL}python:3.12.11-alpine3.22 AS build-image
44
LABEL maintainer="DataKitchen"
55

66
RUN apk update && apk upgrade && apk add --no-cache \
@@ -10,7 +10,7 @@ RUN apk update && apk upgrade && apk add --no-cache \
1010
make \
1111
cmake \
1212
musl-dev \
13-
librdkafka-dev=2.4.0-r0
13+
librdkafka-dev=2.10.0-r0
1414

1515
COPY pyproject.toml /tmp/dk/
1616
# -O: Strips asserts from the code which removes some unnecessary codepaths resulting in a small
@@ -30,7 +30,7 @@ ENV PYTHONPATH ${PYTHONPATH}:/dk/lib/python3.12/site-packages
3030
# --prefix=/dk: The destination installation environment folder
3131
RUN python3 -O -m pip install --no-deps /tmp/dk --prefix=/dk
3232

33-
FROM ${BASE_IMAGE_URL}python:3.12.10-alpine3.20 AS runtime-image
33+
FROM ${BASE_IMAGE_URL}python:3.12.11-alpine3.22 AS runtime-image
3434

3535
RUN apk update && apk upgrade && apk add --no-cache librdkafka=2.4.0-r0
3636

deploy/docker/observability-ui.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
ARG BASE_IMAGE_URL
22

3-
FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE_URL}node:23.10-alpine3.21 AS build-image
3+
FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE_URL}node:23.11.1-alpine3.22 AS build-image
44

55
WORKDIR /observability_ui
66
COPY observability_ui/ /observability_ui
77

88
RUN yarn
99
RUN yarn build:ci
1010

11-
FROM ${BASE_IMAGE_URL}nginxinc/nginx-unprivileged:alpine3.21
11+
FROM ${BASE_IMAGE_URL}nginxinc/nginx-unprivileged:alpine3.22
1212

1313
WORKDIR /observability_ui
1414

observability_ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"private": true,
2020
"engines": {
21-
"node": "v23.10.0"
21+
"node": "v23.11.1"
2222
},
2323
"dependencies": {
2424
"@angular-architects/module-federation": "^16.0.4",

0 commit comments

Comments
 (0)