Skip to content

Commit

Permalink
Fix dnf localinstall
Browse files Browse the repository at this point in the history
dnf5 drops support `localinstall` but just `install`.
  • Loading branch information
fmarco76 committed Jan 17, 2025
1 parent 7de8bfc commit 8d9c397
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ jobs:
- name: Install RPMs
run: |
docker exec jss bash -c "dnf localinstall -y build/RPMS/*.rpm"
docker exec jss bash -c "dnf install -y build/RPMS/*.rpm"
- name: Build with Maven
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
- name: Install packages
run: |
docker cp /tmp/RPMS/. jss:/root/RPMS/
docker exec jss bash -c "dnf localinstall -y /root/RPMS/*"
docker exec jss bash -c "dnf install -y /root/RPMS/*"
- name: Create postgresql certificates
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pki-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
docker exec pki git clone -b master https://github.com/$NAMESPACE/pki
docker exec pki dnf builddep -y --skip-unavailable --spec pki/pki.spec
docker cp /tmp/RPMS/. pki:/root/RPMS/
docker exec pki bash -c "dnf localinstall -y /root/RPMS/*"
docker exec pki bash -c "dnf install -y /root/RPMS/*"
- name: Build and install PKI
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pki-ca-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ jobs:
run: |
# install packages on server
docker cp /tmp/RPMS/. pki:/root/RPMS/
docker exec pki bash -c "dnf localinstall -y /root/RPMS/*"
docker exec pki bash -c "dnf install -y /root/RPMS/*"
# install packages on client1
docker cp /tmp/RPMS/. client1:/root/RPMS/
docker exec client1 bash -c "dnf localinstall -y /root/RPMS/*"
docker exec client1 bash -c "dnf install -y /root/RPMS/*"
# install packages on client2
docker cp /tmp/RPMS/. client2:/root/RPMS/
docker exec client2 bash -c "dnf localinstall -y /root/RPMS/*"
docker exec client2 bash -c "dnf install -y /root/RPMS/*"
- name: Install CA
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pki-tools-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Install packages
run: |
docker cp /tmp/RPMS/. pki:/root/RPMS/
docker exec pki bash -c "dnf localinstall -y /root/RPMS/*"
docker exec pki bash -c "dnf install -y /root/RPMS/*"
- name: Create HSM token
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pki-tps-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Install packages
run: |
docker cp /tmp/RPMS/. pki:/root/RPMS/
docker exec pki bash -c "dnf localinstall -y /root/RPMS/*"
docker exec pki bash -c "dnf install -y /root/RPMS/*"
- name: Install CA
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tomcat-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Install packages
run: |
docker cp /tmp/RPMS/. server:/root/RPMS/
docker exec server bash -c "dnf localinstall -y /root/RPMS/*"
docker exec server bash -c "dnf install -y /root/RPMS/*"
- name: Create Tomcat
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ FROM jss-deps AS jss-runner
COPY --from=jss-dist /root/RPMS /tmp/RPMS/

# Install JSS packages
RUN dnf localinstall -y /tmp/RPMS/* \
RUN dnf install -y /tmp/RPMS/* \
&& dnf clean all \
&& rm -rf /var/cache/dnf \
&& rm -rf /tmp/RPMS
Expand Down

0 comments on commit 8d9c397

Please sign in to comment.