Skip to content

Commit

Permalink
Merge pull request #268 from elfosardo/centos-stream
Browse files Browse the repository at this point in the history
Switch to Centos 8 Stream base image
  • Loading branch information
metal3-io-bot authored Aug 18, 2021
2 parents 79238e5 + e160cd5 commit abc12be
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Build iPXE w/ IPv6 Support
## Note: we are pinning to a specific commit for reproducible builds.
## Updated as needed.
FROM docker.io/centos:centos8 AS ironic-builder
FROM quay.io/centos/centos:stream8 AS ironic-builder
RUN dnf install -y gcc git make xz-devel
WORKDIR /tmp
COPY . .
Expand Down Expand Up @@ -29,7 +29,7 @@ RUN if [ $(uname -m) = "x86_64" ]; then \
touch /tmp/esp.img; \
fi

FROM docker.io/centos:centos8
FROM quay.io/centos/centos:stream8

ENV PKGS_LIST=main-packages-list.txt
ARG EXTRA_PKGS_LIST
Expand Down
2 changes: 1 addition & 1 deletion prepare-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ echo "tsflags=nodocs" >> /etc/dnf/dnf.conf

dnf install -y python3 python3-requests epel-release 'dnf-command(config-manager)'
dnf config-manager --set-disabled epel
curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo --no-stream
curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo
dnf upgrade -y
xargs -rtd'\n' dnf install -y < /tmp/${PKGS_LIST}
if [[ ! -z ${EXTRA_PKGS_LIST:-} ]]; then
Expand Down
4 changes: 2 additions & 2 deletions resources/vbmc/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ARG BASE_IMAGE=docker.io/centos:centos8
ARG BASE_IMAGE=quay.io/centos/centos:stream8

FROM $BASE_IMAGE

RUN dnf install -y python3 python3-requests python3-pip && \
curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo --no-stream && \
curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo && \
dnf upgrade -y && \
dnf install -y python3-virtualbmc && \
dnf clean all && \
Expand Down

0 comments on commit abc12be

Please sign in to comment.