From a63102634fd236671fba15e1b70da937ad2bb99a Mon Sep 17 00:00:00 2001 From: Roman Gorshunov Date: Wed, 14 Jul 2021 13:42:22 +0000 Subject: [PATCH] Update base container image Closes: #14 Change-Id: I23f8d50786e7f1bd3a1c24ee324838bee9ad1107 --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index dafc76a..49315bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,23 @@ # Ansible Operator base image -FROM quay.io/operator-framework/ansible-operator:v0.17.0 +FROM quay.io/operator-framework/ansible-operator:v1.8.0 # Installing dependency libraries COPY airship-host-config/requirements.yml ${HOME}/requirements.yml RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \ - && chmod -R ug+rwx ${HOME}/.ansible + && chmod -R ug+rwx ${HOME}/.ansible # Installing ssh clients - used to connect to kubernetes nodes USER root RUN rpm -ivh https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm -RUN dnf install dbus libnghttp2 python3-librepo dbus-libs librepo dbus-daemon \ +RUN yum install dbus libnghttp2 python3-librepo dbus-libs librepo dbus-daemon \ gnutls dbus-common dbus-tools systemd python3-libxml2 cryptsetup-libs libssh \ libarchive cyrus-sasl-lib curl openssl-libs platform-python glibc systemd-pam \ platform-python-pip python3-pip libcom_err gnupg2 vim-minimal libstdc++ \ python3-libs systemd-libs libssh-config glib2 python3-pip-wheel libsolv \ gdb-gdbserver sqlite-libs libgcrypt libgcc pcre2 glibc-common expat libxml2 \ - libcurl glibc-minimal-langpack libpcap openssh-clients sshpass -y -USER ansible-operator + libcurl glibc-minimal-langpack libpcap openssh-clients sshpass -y \ + && yum clean all && rm -rf /var/cache/yum +USER ansible # Configuration for ansible COPY airship-host-config/build/ansible.cfg /etc/ansible/ansible.cfg @@ -39,7 +40,7 @@ COPY airship-host-config/plugins/ ${HOME}/plugins/ # ansible-runner unable to pick custom callback plugins specified in any other directory other than /usr/local/lib/python3.6/site-packages/ansible/plugins/callback # ansible-runner is overriding the ANSIBLE_CALLBACK_PLUGINS Environment variable # https://github.com/ansible/ansible-runner/blob/stable/1.3.x/ansible_runner/runner_config.py#L178 -COPY airship-host-config/plugins/callback/hostconfig_k8_cr_status.py /usr/local/lib/python3.6/site-packages/ansible/plugins/callback/ +COPY airship-host-config/plugins/callback/hostconfig_k8_cr_status.py /usr/local/lib/python3.8/site-packages/ansible/plugins/callback/ # Copying scripts folder used by exec configuration COPY airship-host-config/scripts/ ${HOME}/scripts/