diff options
| -rw-r--r-- | policy-jdk/alpine/src/main/docker/Dockerfile | 19 | ||||
| -rw-r--r-- | policy-jre/alpine/src/main/docker/Dockerfile | 4 |
2 files changed, 11 insertions, 12 deletions
diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile index b0a73a9e..e868c5b3 100644 --- a/policy-jdk/alpine/src/main/docker/Dockerfile +++ b/policy-jdk/alpine/src/main/docker/Dockerfile @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2019 Tieto. All rights reserved. # Modifications Copyright (C) 2020, 2021 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2020, 2022-2023 Nordix Foundation. +# Modifications Copyright (C) 2020, 2022-2024 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= -FROM alpine:3.18.2 +FROM alpine:3.20.3 LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy JRE Alpine" @@ -75,16 +75,15 @@ RUN apk update && \ adduser -S --shell /bin/sh -G policy policy && \ mkdir -p ${POLICY_HOME}/ && \ chown policy:policy ${POLICY_HOME} && \ - mkdir -p /usr/lib/jvm/ && \ - ln -s /opt/java/openjdk /usr/lib/jvm/default-jvm && \ - python3 -m ensurepip && \ - pip3 install --no-cache --upgrade pip setuptools + mkdir -p /usr/lib/jvm/ && ln -s /opt/java/openjdk /usr/lib/jvm/default-jvm # Install python/pip -RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python -RUN python3 -m ensurepip -RUN pip3 install --no-cache --upgrade pip setuptools - +RUN apk add --no-cache python3 && \ + rm /usr/lib/python3.*/EXTERNALLY-MANAGED && \ + if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python ; fi && \ + python -m ensurepip && \ + if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \ + pip install --no-cache --upgrade pip setuptools # Tell docker that all future commands should be run as the onap user USER $user diff --git a/policy-jre/alpine/src/main/docker/Dockerfile b/policy-jre/alpine/src/main/docker/Dockerfile index d8af19f8..c5c0273d 100644 --- a/policy-jre/alpine/src/main/docker/Dockerfile +++ b/policy-jre/alpine/src/main/docker/Dockerfile @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2019 Tieto. All rights reserved. # Modifications Copyright (C) 2020, 2021 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2020, 2022-2023 Nordix Foundation. +# Modifications Copyright (C) 2020, 2022-2024 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= -FROM alpine:3.18.2 +FROM alpine:3.20.3 LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy JRE Alpine" |