Skip to content

Commit f0cd757

Browse files
committed
ci: switch to Fedora-based image
Related to packit/deployment#638 Signed-off-by: Matej Focko <mfocko@redhat.com>
1 parent 01508e7 commit f0cd757

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/packit/base:c9s
1+
FROM quay.io/packit/base:fedora
22

33
# set default value, can be overriden by --build-arg while building
44
ARG VITE_API_URL=https://stg.packit.dev/api

Dockerfile.tests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM fedora:35
1+
FROM quay.io/packit/base:fedora
22

33
ENV HOME=/home/packit_dashboard \
44
ANSIBLE_PYTHON_INTERPRETER=/usr/bin/python3 \

files/ansible/install-deps.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,27 @@
44
vars:
55
packit_dashboard_path: /src
66
tasks:
7+
- name: Switching between supported underlying distributions
8+
block:
9+
- name: Set node.js package name for CentOS
10+
ansible.builtin.set_fact:
11+
node_pkg: "@nodejs:20"
12+
when: ansible_distribution == "CentOS"
13+
14+
- name: Set node.js package name for Fedora
15+
ansible.builtin.set_fact:
16+
node_pkg: "nodejs"
17+
when: ansible_distribution == "Fedora"
18+
719
- name: Install all RPM/Python/Node packages needed to run dashboard
8-
dnf:
20+
ansible.builtin.dnf:
921
name:
1022
- python3-pip
1123
- python3-flask
1224
- python3-flask-talisman
1325
- python3-cachetools
1426
- python3-requests
15-
- "@nodejs:20"
27+
- "{{ node_pkg }}"
1628
- python3-mod_wsgi
1729
- mod_ssl
1830
- mod_http2

0 commit comments

Comments
 (0)