Skip to content

Commit

Permalink
CI: Update dockerfiles prior to merge pull 9287 (#9288)
Browse files Browse the repository at this point in the history
Signed-off-by: Jordi Massaguer Pla <[email protected]>
  • Loading branch information
jordimassaguerpla authored Sep 25, 2024
1 parent 6f20600 commit 65aebef
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 4 deletions.
17 changes: 17 additions & 0 deletions testsuite/dockerfiles/buildhost/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM opensuse/leap:15.5
RUN zypper -n ar --no-gpgcheck https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/images/repo/Uyuni-Server-POOL-x86_64-Media1/ Uyuni-Server-POOL-x86_64 && \
zypper -n ar --no-gpgcheck https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/systemsmanagement:Uyuni:Test-Packages:Pool.repo && \
zypper -n ar --no-gpgcheck https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/openSUSE_Leap_15-Uyuni-Client-Tools/openSUSE_Leap_15.0/ tools_pool_repo && \
zypper ref -f && \
zypper -n install openssh-server openssh-clients hostname iproute2 venv-salt-minion andromeda-dummy milkyway-dummy virgo-dummy openscap-utils openscap-content scap-security-guide gzip udev dmidecode tar \
golang-github-prometheus-prometheus golang-github-prometheus-alertmanager prometheus-blackbox_exporter golang-github-prometheus-node_exporter golang-github-lusitaniae-apache_exporter prometheus-postgres_exporter golang-github-QubitProducts-exporter_exporter golang-github-prometheus-promu ansible && \
zypper clean -a
RUN zypper -n ar --no-gpgcheck https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/ test_repo_rpm_pool
# specific to buildhost
RUN zypper ref -f && \
zypper -n install docker docker-buildx \
&& \
zypper clean -a
COPY etc_pam.d_sshd /etc/pam.d/sshd
CMD ssh-keygen -A && /usr/sbin/sshd -De

11 changes: 11 additions & 0 deletions testsuite/dockerfiles/buildhost/etc_pam.d_sshd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#%PAM-1.0
auth requisite pam_nologin.so
auth include common-auth
account requisite pam_nologin.so
account include common-account
password include common-password
session optional pam_loginuid.so
session include common-session
session optional pam_lastlog.so silent noupdate showfailed
session optional pam_keyinit.so force revoke

2 changes: 2 additions & 0 deletions testsuite/dockerfiles/container-registry-auth/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM registry:2

2 changes: 2 additions & 0 deletions testsuite/dockerfiles/container-registry/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM registry:2

6 changes: 4 additions & 2 deletions testsuite/dockerfiles/opensuse-minion/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM opensuse/leap:15.5
RUN zypper -n ar --no-gpgcheck https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/images/repo/Uyuni-Server-POOL-x86_64-Media1/ Uyuni-Server-POOL-x86_64 && \
zypper -n ar --no-gpgcheck https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/systemsmanagement:Uyuni:Test-Packages:Pool.repo && \
zypper ref -f && \
zypper -n install openssh-server openssh-clients hostname iproute2 venv-salt-minion andromeda-dummy milkyway-dummy virgo-dummy openscap-utils openscap-content scap-security-guide gzip udev dmidecode tar && \
zypper -n ar --no-gpgcheck https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/openSUSE_Leap_15-Uyuni-Client-Tools/openSUSE_Leap_15.0/ tools_pool_repo && \
zypper ref -f && \
zypper -n install openssh-server openssh-clients hostname iproute2 venv-salt-minion andromeda-dummy milkyway-dummy virgo-dummy openscap-utils openscap-content scap-security-guide gzip udev dmidecode tar \
golang-github-prometheus-prometheus golang-github-prometheus-alertmanager prometheus-blackbox_exporter golang-github-prometheus-node_exporter golang-github-lusitaniae-apache_exporter prometheus-postgres_exporter golang-github-QubitProducts-exporter_exporter golang-github-prometheus-promu ansible && \
zypper clean -a
RUN zypper -n ar --no-gpgcheck https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/ test_repo_rpm_pool
COPY etc_pam.d_sshd /etc/pam.d/sshd
Expand Down
3 changes: 2 additions & 1 deletion testsuite/dockerfiles/rocky-minion/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM rockylinux:8
COPY uyuni-tools-pool.repo /etc/yum.repos.d
RUN yum -y install openssh-server venv-salt-minion openssh-clients iproute hostname openscap-utils scap-security-guide-redhat udev dmidecode tar
RUN yum -y install openssh-server venv-salt-minion openssh-clients iproute hostname openscap-utils scap-security-guide-redhat udev dmidecode tar \
golang-github-prometheus-node_exporter golang-github-lusitaniae-apache_exporter prometheus-postgres_exporter
COPY test_repo_rpm_pool.repo /etc/yum.repos.d
COPY etc_pam.d_sshd /etc/pam.d/sshd
CMD ssh-keygen -A && /usr/sbin/sshd -De
1 change: 1 addition & 0 deletions testsuite/dockerfiles/server-all-in-one-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ RUN zypper -n --gpg-auto-import-keys ref && \
cpio \
spacecmd \
expect \
prometheus \
wget && \
zypper addrepo --no-gpgcheck obs://systemsmanagement:Uyuni:Utils systemsmanagement:uyuni:utils && \
zypper -n install obs-to-maven yarn && \
Expand Down
3 changes: 2 additions & 1 deletion testsuite/dockerfiles/ubuntu-minion/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM ubuntu:22.04
RUN echo "deb [trusted=yes] http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Ubuntu2204-Uyuni-Client-Tools/xUbuntu_22.04/ /" > /etc/apt/sources.list.d/uyuni-tools.list
RUN apt-get update && \
apt-get -y install venv-salt-minion openssh-server openssh-client hostname iproute2 libopenscap8 scap-security-guide-ubuntu udev dmidecode tar && \
apt-get -y install venv-salt-minion openssh-server openssh-client hostname iproute2 libopenscap8 scap-security-guide-ubuntu udev dmidecode tar \
prometheus-node-exporter prometheus-apache-exporter prometheus-postgres-exporter prometheus-exporter-exporter prometheus-apache-exporter prometheus-node-exporter && \
apt-get clean
RUN echo "deb [trusted=yes] https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/deb/ /" > /etc/apt/sources.list.d/test_repo_deb_pool.list
RUN mkdir /run/sshd
Expand Down

0 comments on commit 65aebef

Please sign in to comment.