From 46665ae54e3f42c2c8308cd6a6b39986f0590c4a Mon Sep 17 00:00:00 2001 From: James Slagle Date: Thu, 22 Sep 2022 20:24:50 -0400 Subject: [PATCH] Remove unused molecule Dockerfile.j2 This Dockerfile.j2 file is not used by molecule. Only the molecule scenario directory is checked for the existence of the file specified with the "dockerfile" key in the platforms YAML. If that file doesn't exist, the default Dockerfile.j2 bundled with molecule is used. Change-Id: Ib47c029955c1c800b672d964d1e15e05d2d0ae18 Signed-off-by: James Slagle --- .config/molecule/Dockerfile.j2 | 37 ---------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 .config/molecule/Dockerfile.j2 diff --git a/.config/molecule/Dockerfile.j2 b/.config/molecule/Dockerfile.j2 deleted file mode 100644 index 413b8c4ca..000000000 --- a/.config/molecule/Dockerfile.j2 +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# Copyright 2019 Red Hat, Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - - -{% if item.registry is defined %} -FROM {{ item.registry.url }}/{{ item.image }} -{% else %} -FROM {{ item.image }} -{% endif %} - -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ - elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi - -{% for pkg in item.easy_install | default([]) %} -# install pip for centos where there is no python-pip rpm in default repos -RUN easy_install {{ pkg }} -{% endfor %} - -CMD ["sh", "-c", "while true; do sleep 10000; done"]