Skip to content

Commit

Permalink
Merge pull request #115 from openshift-cherrypick-robot/cherry-pick-1…
Browse files Browse the repository at this point in the history
…14-to-release-4.15

OCPBUGS-30078: [release-4.15] OCPBUGS-30078: Fix tripleo url with commit hash for openstack repos config
  • Loading branch information
openshift-merge-bot[bot] committed Feb 29, 2024
2 parents cd0769a + 3d169a7 commit 39d5064
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions Dockerfile.okd
@@ -1,4 +1,4 @@
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9

ENV PKGS_LIST=packages-list.okd
ARG EXTRA_PKGS_LIST
Expand All @@ -7,9 +7,12 @@ ARG PATCH_LIST
COPY ${PKGS_LIST}* ${EXTRA_PKGS_LIST:-$PKGS_LIST} ${PATCH_LIST:-$PKGS_LIST} /tmp/
COPY prepare-image.sh patch-image.sh /bin/

# Configure OpenStack repos
RUN dnf install --setopt=install_weak_deps=False --setopt=tsflags=nodocs -y python3 python3-requests && \
curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo
# Configure OpenStack repos from RDO https://www.rdoproject.org
RUN dnf upgrade -y && \
dnf install -y dnf-plugins-core && \
dnf config-manager --enable crb && \
curl https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo -o /etc/yum.repos.d/rdo.repo && \
curl https://trunk.rdoproject.org/centos9-master/delorean-deps.repo -o /etc/yum.repos.d/rdo-deps.repo

RUN prepare-image.sh && \
mkdir -p /etc/ironic-python-agent && \
Expand Down

0 comments on commit 39d5064

Please sign in to comment.