From a18691b02a97278c2e91a4e6c1bb1776cb46aea4 Mon Sep 17 00:00:00 2001 From: Nicolas Thumann Date: Tue, 12 Nov 2024 16:25:49 +0100 Subject: [PATCH] Change: Disable upgrade by default --- README.md | 4 ++-- applications/generic/Dockerfile | 2 +- applications/oracle-weblogic/10.3.6.0-2017/Dockerfile | 2 +- applications/oracle-weblogic/12.2.1.3-2018/Dockerfile | 2 +- operating_systems/almalinux/Dockerfile | 2 +- operating_systems/amazonlinux/Dockerfile | 2 +- operating_systems/debian/Dockerfile | 2 +- operating_systems/fedora/Dockerfile | 2 +- operating_systems/mageia/Dockerfile | 2 +- operating_systems/openeuler/Dockerfile | 2 +- operating_systems/oraclelinux/Dockerfile | 2 +- operating_systems/rockylinux/Dockerfile | 2 +- operating_systems/slackware/Dockerfile | 2 +- operating_systems/ubuntu/Dockerfile | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 8d47129..519bfa2 100644 --- a/README.md +++ b/README.md @@ -164,8 +164,8 @@ To build e.g. the image for Mageia 8 use: docker build operating_systems/mageia --build-arg=TAG=8 -t mageia:8 ``` -If not specified otherwise, the image will be built with its packages explicitly updated. This is available for most images. To build the image for Oracle Linux 5 (non-updated) use: +If not specified otherwise, the image will be built with its packages explicitly not updated. This is available for most images. To build the image for Oracle Linux 5 (updated) use: ``` -docker build operating_systems/oraclelinux --build-arg=TAG=5 --build-arg=UPDATED=false -t oraclelinux:5 +docker build operating_systems/oraclelinux --build-arg=TAG=5 --build-arg=UPDATED=true -t oraclelinux:5 ``` diff --git a/applications/generic/Dockerfile b/applications/generic/Dockerfile index 22690f1..91724f5 100644 --- a/applications/generic/Dockerfile +++ b/applications/generic/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE ARG TAG FROM ghcr.io/greenbone/vt-test-environments/${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false ARG TAG # Install dependencies diff --git a/applications/oracle-weblogic/10.3.6.0-2017/Dockerfile b/applications/oracle-weblogic/10.3.6.0-2017/Dockerfile index 6c37b5e..c7b6d6c 100644 --- a/applications/oracle-weblogic/10.3.6.0-2017/Dockerfile +++ b/applications/oracle-weblogic/10.3.6.0-2017/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=vulhub/weblogic ARG TAG=10.3.6.0-2017 FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false ENV DEBIAN_FRONTEND=noninteractive RUN ( \ diff --git a/applications/oracle-weblogic/12.2.1.3-2018/Dockerfile b/applications/oracle-weblogic/12.2.1.3-2018/Dockerfile index 872f471..b7278bd 100644 --- a/applications/oracle-weblogic/12.2.1.3-2018/Dockerfile +++ b/applications/oracle-weblogic/12.2.1.3-2018/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=vulhub/weblogic ARG TAG=12.2.1.3-2018 FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false USER root diff --git a/operating_systems/almalinux/Dockerfile b/operating_systems/almalinux/Dockerfile index d493fbe..3d52b05 100644 --- a/operating_systems/almalinux/Dockerfile +++ b/operating_systems/almalinux/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=almalinux ARG TAG FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false ARG TAG # Lock releasever to the tag to pin the minor release diff --git a/operating_systems/amazonlinux/Dockerfile b/operating_systems/amazonlinux/Dockerfile index ef6a39d..7a70eab 100644 --- a/operating_systems/amazonlinux/Dockerfile +++ b/operating_systems/amazonlinux/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=amazonlinux ARG TAG FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false RUN if [ "$UPDATED" = true ]; then yum upgrade -y; fi \ && yum install -y openssh-server passwd \ diff --git a/operating_systems/debian/Dockerfile b/operating_systems/debian/Dockerfile index 710d6a7..872c64e 100644 --- a/operating_systems/debian/Dockerfile +++ b/operating_systems/debian/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=debian ARG TAG FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update \ diff --git a/operating_systems/fedora/Dockerfile b/operating_systems/fedora/Dockerfile index ccf05cf..be04820 100644 --- a/operating_systems/fedora/Dockerfile +++ b/operating_systems/fedora/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=fedora ARG TAG FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false RUN if [ "$UPDATED" = true ]; then dnf upgrade -y; fi \ && dnf install -y openssh-server \ diff --git a/operating_systems/mageia/Dockerfile b/operating_systems/mageia/Dockerfile index df6e5d6..17537f4 100644 --- a/operating_systems/mageia/Dockerfile +++ b/operating_systems/mageia/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=mageia ARG TAG FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false RUN if [ "$UPDATED" = true ]; then dnf upgrade -y; fi \ && dnf install -y openssh-server \ diff --git a/operating_systems/openeuler/Dockerfile b/operating_systems/openeuler/Dockerfile index 64f57c7..15bc0f8 100644 --- a/operating_systems/openeuler/Dockerfile +++ b/operating_systems/openeuler/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=openeuler/openeuler ARG TAG FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false RUN if [ "$UPDATED" = true ]; then dnf upgrade -y; fi \ && dnf install -y openssh-server passwd \ diff --git a/operating_systems/oraclelinux/Dockerfile b/operating_systems/oraclelinux/Dockerfile index 52a195e..c870d1c 100644 --- a/operating_systems/oraclelinux/Dockerfile +++ b/operating_systems/oraclelinux/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=oraclelinux ARG TAG FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false RUN if [ "$UPDATED" = true ]; then yum upgrade -y && yum clean all; fi \ && useradd demo \ diff --git a/operating_systems/rockylinux/Dockerfile b/operating_systems/rockylinux/Dockerfile index 9197ae1..3b543ef 100644 --- a/operating_systems/rockylinux/Dockerfile +++ b/operating_systems/rockylinux/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=rockylinux ARG TAG FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false ARG TAG # Lock releasever to the tag to pin the minor release diff --git a/operating_systems/slackware/Dockerfile b/operating_systems/slackware/Dockerfile index 5573ace..16a9d4e 100644 --- a/operating_systems/slackware/Dockerfile +++ b/operating_systems/slackware/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=vbatts/slackware ARG TAG FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false RUN slackpkg update \ # When updating, we need to upgrade slackpkg itself first. Otherwise upgrade-all will abort. diff --git a/operating_systems/ubuntu/Dockerfile b/operating_systems/ubuntu/Dockerfile index cfbf76c..4b184b7 100644 --- a/operating_systems/ubuntu/Dockerfile +++ b/operating_systems/ubuntu/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=ubuntu ARG TAG FROM ${BASEIMAGE}:${TAG} -ARG UPDATED=true +ARG UPDATED=false ENV DEBIAN_FRONTEND=noninteractive RUN ( \