Skip to content

Commit

Permalink
NO-ISSUE: Fix security issues on images
Browse files Browse the repository at this point in the history
Signed-off-by: Ricardo Zanini <[email protected]>
  • Loading branch information
ricardozanini committed Dec 23, 2024
1 parent c59b389 commit 6f31953
Show file tree
Hide file tree
Showing 24 changed files with 27 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ quarkus.native.native-image-xmx=8g
%container.quarkus.container-image.registry=dev.local
%container.quarkus.container-image.tag=1.0-SNAPSHOT
%container.quarkus.jib.jvm-entrypoint=/home/kogito/kogito-app-launch.sh
%container.quarkus.jib.base-jvm-image=registry.access.redhat.com/ubi9/openjdk-17:1.20
%container.quarkus.jib.base-jvm-image=registry.access.redhat.com/ubi9/openjdk-17:1.21
%container.quarkus.jib.working-directory=/home/kogito/bin
2 changes: 1 addition & 1 deletion packages/cors-proxy-image/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.5

ARG CORS_PROXY_DEFAULT_PORT=8080
ARG CORS_PROXY_DEFAULT_ORIGIN=*
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-viewer-image/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.5

RUN microdnf --disableplugin=subscription-manager -y install httpd \
&& microdnf --disableplugin=subscription-manager clean all \
Expand Down
4 changes: 2 additions & 2 deletions packages/dev-deployment-base-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ Docker image with Java and Maven, as well as the dev-deployment-upload-service b

## Build arguments

- `BUILDER_IMAGE_ARG`: The base image used for building this image (defaults to `registry.access.redhat.com/ubi9/openjdk-17:1.20`).
- `BUILDER_IMAGE_ARG`: The base image used for building this image (defaults to `registry.access.redhat.com/ubi9/openjdk-17:1.21`).
- Tested with:
- registry.access.redhat.com/ubi9/openjdk-17:1.20
- registry.access.redhat.com/ubi9/openjdk-17:1.21
- icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi-minimal

## Environment variables
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-deployment-base-image/env/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const rootEnv = require("@kie-tools/root-env/env");
module.exports = composeEnv([rootEnv], {
vars: varsWithName({
DEV_DEPLOYMENT_BASE_IMAGE__builderImage: {
default: "registry.access.redhat.com/ubi9/openjdk-17:1.20",
default: "registry.access.redhat.com/ubi9/openjdk-17:1.21",
description: "The image used in the FROM import.",
},
DEV_DEPLOYMENT_BASE_IMAGE__userId: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.5

ARG DEV_DEPLOYMENT_DMN_FORM_WEBAPP_DEFAULT_PORT=8081

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5

ARG DDUS_FILESERVER_IP=""
ARG DDUS_VERSION="0.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5

ARG DDUS_VERSION="0.0.0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5

ENV DDUS_FILESERVER_IP=""
ENV DDUS_VERSION="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/kie-sandbox-extended-services-image/env/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const {
module.exports = composeEnv([rootEnv], {
vars: varsWithName({
KIE_SANDBOX_EXTENDED_SERVICES__builderImage: {
default: "registry.access.redhat.com/ubi9/openjdk-17:1.20",
default: "registry.access.redhat.com/ubi9/openjdk-17:1.21",
description: "The image used in the FROM import.",
},
KIE_SANDBOX_EXTENDED_SERVICES__imageRegistry: {
Expand Down
2 changes: 1 addition & 1 deletion packages/kie-sandbox-webapp-image/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.5

ARG KIE_SANDBOX_DEFAULT_PORT=8080

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ schema_version: 1

name: "docker.io/apache/incubator-kie-kogito-base-builder"
version: "main"
from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
from: "registry.access.redhat.com/ubi8/openjdk-17:1.21"
description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !"

labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
name: "docker.io/apache/incubator-kie-kogito-data-index-ephemeral"
version: "main"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.21"
description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"

labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ schema_version: 1

name: "docker.io/apache/incubator-kie-kogito-data-index-postgresql"
version: "main"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.21"
description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"

labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ schema_version: 1

name: "docker.io/apache/incubator-kie-kogito-jit-runner"
version: "main"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.21"
description: "Runtime image for Kogito JIT Runner"

labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ schema_version: 1

name: "docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral"
version: "main"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.21"
description: "Runtime image for Kogito Jobs Service with all available jdbc providers"

labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ schema_version: 1

name: "docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral"
version: "main"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.21"
description: "Runtime image for Kogito in memory Jobs Service"

labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ schema_version: 1

name: "docker.io/apache/incubator-kie-kogito-jobs-service-postgresql"
version: "main"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.21"
description: "Runtime image for Kogito Jobs Service based on Postgresql"

labels:
Expand Down
2 changes: 1 addition & 1 deletion packages/kogito-management-console/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.5

ARG KOGITO_MANAGEMENT_CONSOLE_PORT=8080

Expand Down
2 changes: 1 addition & 1 deletion packages/maven-m2-repo-via-http-image/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.5

# Argument for configuring the port
ARG PORT=80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.
#
- name: builder
from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
from: "registry.access.redhat.com/ubi8/openjdk-17:1.21"
version: "main"
modules:
repositories:
Expand All @@ -34,7 +34,7 @@
- name: org.kie.sonataflow.common.build

- name: "docker.io/apache/incubator-kie-sonataflow-builder"
from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
from: "registry.access.redhat.com/ubi8/openjdk-17:1.21"
version: "main"
description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.
#
- name: builder
from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
from: "registry.access.redhat.com/ubi8/openjdk-17:1.21"
version: "main"
modules:
repositories:
Expand All @@ -37,7 +37,7 @@
manager: microdnf

- name: "docker.io/apache/incubator-kie-sonataflow-devmode"
from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
from: "registry.access.redhat.com/ubi8/openjdk-17:1.21"
version: "main"
description: "Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.
#
- name: "docker.io/apache/incubator-kie-sonataflow-devmode"
from: "registry.access.redhat.com/ubi9/httpd-24:1-336.1725850633"
from: "registry.access.redhat.com/ubi9/httpd-24:9.5"
version: "0.0.0"
description: "SonataFlow Management Console Image"

Expand Down
2 changes: 1 addition & 1 deletion packages/sonataflow-operator/images/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

- name: sonataflow-operator
version: 0.0.0
from: "registry.access.redhat.com/ubi9/ubi-micro:9.5-1731519709"
from: "registry.access.redhat.com/ubi9/ubi-micro:9.5"
description: Runtime Image for the Operator

args:
Expand Down

0 comments on commit 6f31953

Please sign in to comment.