Skip to content
This repository has been archived by the owner on Dec 10, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into mquhuy/move-container-build-to-GH-runner
Browse files Browse the repository at this point in the history
  • Loading branch information
mquhuy authored Aug 8, 2024
2 parents 0161fff + a1dfd1c commit 081ebe3
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-images-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
secrets:
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
11 changes: 5 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ FROM quay.io/centos/centos:stream9
# Help people find the actual baremetal command
COPY scripts/openstack /usr/bin/openstack

RUN dnf install -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 && \
dnf update -y --setopt=install_weak_deps=False && \
dnf install -y --setopt=install_weak_deps=False python3-ironicclient python3-ironic-inspector-client && \
RUN dnf install -y python3 python3-pip && \
pip install python-ironicclient --prefix /usr --no-cache-dir && \
chmod +x /usr/bin/openstack && \
dnf update -y && \
dnf clean all && \
rm -rf /var/cache/{yum,dnf}/* && \
chmod +x /usr/bin/openstack
rm -rf /var/cache/{yum,dnf}/*

ENTRYPOINT ["/usr/bin/baremetal"]
16 changes: 6 additions & 10 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
# See the OWNERS docs at https://go.k8s.io/owners

approvers:
- bfournie
- derekhiggins
- dtantsur
- elfosardo
- iurygregory
- ironic-client-maintainers

reviewers:
- zaneb
- ironic-client-maintainers
- ironic-client-reviewers

emeritus_reviewers:
- maelk
- stbenjam
- maelk
- stbenjam

emeritus_approvers:
- hardys

- hardys
12 changes: 12 additions & 0 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md

aliases:
ironic-client-maintainers:
- bfournie
- derekhiggins
- dtantsur
- elfosardo
- iurygregory

ironic-client-reviewers:
- zaneb
2 changes: 1 addition & 1 deletion hack/shellcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CONTAINER_RUNTIME="${CONTAINER_RUNTIME:-podman}"

if [ "${IS_CONTAINER}" != "false" ]; then
TOP_DIR="${1:-.}"
find "${TOP_DIR}" \( -name '*.sh' -o -wholename 'scripts/*' \) -exec shellcheck -s bash {} \+
find "${TOP_DIR}" \( -name '*.sh' -o -wholename 'scripts/*' \) -type f -exec shellcheck -s bash {} \+
else
"${CONTAINER_RUNTIME}" run --rm \
--env IS_CONTAINER=TRUE \
Expand Down

0 comments on commit 081ebe3

Please sign in to comment.