Skip to content

Commit

Permalink
Update base image to RH UBI 9 (#44)
Browse files Browse the repository at this point in the history
Migrate to RHEL9

- Use ubi9 as base image and include OpenStack repos

- Also updates the Dockerfile to be more descriptive
(use SGBRIDGE_DIR instead of D)

- Update action to run on Ubuntu 22.04

- Update DoozyX/clang-format-lint-action version
  • Loading branch information
vkmc authored Feb 5, 2025
1 parent 88dbdfb commit bab11fb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Checkout code
uses: actions/[email protected]
- name: Run clang-format-lint
uses: DoozyX/clang-format-lint-action@v0.11
uses: DoozyX/clang-format-lint-action@v0.18.2
with:
source: '.'
exclude: './build'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on: [push, pull_request]
jobs:
unit-tests:
name: Unit tests
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down
10 changes: 5 additions & 5 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# --- Build the bridge
FROM registry.access.redhat.com/ubi8 AS builder
FROM registry.access.redhat.com/ubi9 AS builder

# dependencies for qpid-proton-c
COPY build/repos/opstools.repo /etc/yum.repos.d/opstools.repo
Expand All @@ -11,16 +11,16 @@ RUN dnf install qpid-proton-c-devel --setopt=tsflags=nodocs -y && \
dnf install gcc make redhat-rpm-config -y && \
dnf clean all

ENV D=/home/bridge
ENV SGBRIDGE_DIR=/home/bridge

WORKDIR $D
COPY . $D/
WORKDIR $SGBRIDGE_DIR
COPY . $SGBRIDGE_DIR/

RUN make && \
mv bridge /tmp/

# --- end build, create bridge runtime layer ---
FROM registry.access.redhat.com/ubi8
FROM registry.access.redhat.com/ubi9

# dependencies for qpid-proton-c
COPY build/repos/opstools.repo /etc/yum.repos.d/opstools.repo
Expand Down
22 changes: 6 additions & 16 deletions build/repos/opstools.repo
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
# CentOS-OpsTools.repo
# CentOS 9 Opstools repos
#
# Please see http://wiki.centos.org/SpecialInterestGroup/OpsTools for more
# information

[centos-opstools-testing]
name=CentOS-OpsTools - testing repo
baseurl=https://buildlogs.centos.org/centos/$releasever-stream/opstools/$basearch/collectd-5/
gpgcheck=0
enabled=0

[centos-opstools]
name=CentOS-OpsTools - collectd
#mirrorlist=http://mirrorlist.centos.org/?arch=$basearch&release=$releasever-stream&repo=opstools-collectd-5
baseurl=http://vault.centos.org/$releasever-stream/opstools/$basearch/collectd-5/
gpgcheck=0
[centos9-opstools]
name=centos9-opstools
baseurl=http://mirror.stream.centos.org/SIGs/9-stream/opstools/$basearch/collectd-5/
enabled=1
skip_if_unavailable=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools
gpgcheck=0
module_hotfixes=1

0 comments on commit bab11fb

Please sign in to comment.