Skip to content

Commit 74ea97d

Browse files
committed
Update buildpacks
1 parent 9c39143 commit 74ea97d

File tree

6 files changed

+29
-12
lines changed

6 files changed

+29
-12
lines changed

stn-deploy-2024.1/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
FROM rockylinux:9.3
1+
FROM rockylinux/rockylinux:9
22

33
RUN dnf -y update && \
4-
dnf -y install gcc git iputils jq libffi-devel openssl-devel perl-Digest-SHA procps-ng python3-devel python3-libselinux rsync sshpass unzip wget which && \
4+
dnf -y install gcc git iputils jq libffi-devel openssl-devel perl-Digest-SHA procps-ng python3.12 python3.12-devel python3.12-pip python3-libselinux rsync sshpass unzip wget which && \
55
dnf clean all && \
66
rm -rf /var/cache/yum
77

88
# kolla-ansible has specific dependencies on the ansible versions
9-
RUN pip install --no-cache-dir --upgrade pip && \
10-
pip install --no-cache-dir --upgrade 'ansible-core>=2.15,<2.16.99' && \
11-
pip install --no-cache-dir openstackclient
9+
RUN pip3.12 install --no-cache-dir --upgrade pip && \
10+
pip3.12 install --no-cache-dir --upgrade 'ansible-core>=2.15,<2.16.99' && \
11+
pip3.12 install --no-cache-dir openstackclient
1212

1313
# checkout kolla-ansible
1414
RUN git clone -b stable/2024.1 https://opendev.org/openstack/kolla-ansible.git /tmp/kolla-ansible
@@ -18,7 +18,7 @@ ADD patches /tmp/patches
1818
RUN cd /tmp/kolla-ansible && git apply --allow-empty -v /tmp/patches/*.patch
1919

2020
# install patched kolla-ansible
21-
RUN pip install --no-cache-dir /tmp/kolla-ansible
21+
RUN pip3.12 install --no-cache-dir /tmp/kolla-ansible
2222

2323
# create config file dirs
2424
RUN mkdir -p /etc/kolla && \

stn-deploy-2024.1/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.1
1+
0.0.2

stn-deploy-2024.2/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
FROM rockylinux/rockylinux:9
22

33
RUN dnf -y update && \
4-
dnf -y install gcc git iputils jq libffi-devel openssl-devel perl-Digest-SHA procps-ng python3-devel python3-libselinux rsync sshpass unzip wget which && \
4+
dnf -y install gcc git iputils jq libffi-devel openssl-devel perl-Digest-SHA procps-ng python3.12 python3.12-devel python3.12-pip python3-libselinux rsync sshpass unzip wget which && \
55
dnf clean all && \
66
rm -rf /var/cache/yum
77

88
# kolla-ansible has specific dependencies on the ansible versions
9-
RUN pip install --no-cache-dir --upgrade pip && \
10-
pip install --no-cache-dir --upgrade 'ansible-core>=2.16,<2.17.99' && \
11-
pip install --no-cache-dir openstackclient
9+
RUN pip3.12 install --no-cache-dir --upgrade pip && \
10+
pip3.12 install --no-cache-dir --upgrade 'ansible-core>=2.16,<2.17.99' && \
11+
pip3.12 install --no-cache-dir openstackclient
1212

1313
# checkout kolla-ansible
1414
RUN git clone -b stable/2024.2 https://opendev.org/openstack/kolla-ansible.git /tmp/kolla-ansible
@@ -18,7 +18,7 @@ ADD patches /tmp/patches
1818
RUN cd /tmp/kolla-ansible && git apply --allow-empty -v /tmp/patches/*.patch
1919

2020
# install patched kolla-ansible
21-
RUN pip install --no-cache-dir /tmp/kolla-ansible
21+
RUN pip3.12 install --no-cache-dir /tmp/kolla-ansible
2222

2323
# create config file dirs
2424
RUN mkdir -p /etc/kolla && \

stn-deploy-2024.2/VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.0.1
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[defaults]
2+
forks = 20
3+
timeout = 60
4+
display_skipped_hosts = False
5+
gathering = smart
6+
fact_caching = jsonfile
7+
fact_caching_connection = /tmp/ansible-facts
8+
inject_facts_as_vars = False
9+
10+
[ssh_connection]
11+
pipelining = True
12+
13+
# https://github.com/ansible/awx/issues/14496
14+
[galaxy]
15+
server = https://old-galaxy.ansible.com/
16+

stn-deploy-2024.2/patches/00-empty.patch

Whitespace-only changes.

0 commit comments

Comments
 (0)