From 554937009eab49bc8166d680f0456cdc9e6d850d Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Mon, 4 Jul 2022 21:15:47 -0400 Subject: [PATCH] Fixup container files --- .github/workflows/mix-empanadas.yml | 4 ++-- iso/empanadas/Containerfile | 2 +- iso/empanadas/Containerfile.imagefactory | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/mix-empanadas.yml b/.github/workflows/mix-empanadas.yml index 7ee3791..ebae78d 100644 --- a/.github/workflows/mix-empanadas.yml +++ b/.github/workflows/mix-empanadas.yml @@ -40,8 +40,8 @@ jobs: builder: ${{ steps.buildx.outputs.name }} platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le context: ./iso/empanadas - file: ./iso/empanadas/Containerfile.imagefactory + file: ./iso/empanadas/Containerfile push: ${{ github.event_name != 'pull_request' }} - tags: ghcr.io/rocky-linux/empanadas-imagefactory:latest + tags: ghcr.io/rocky-linux/sig-core-toolkit:latest cache-from: type=gha cache-to: type=gha,mode=max diff --git a/iso/empanadas/Containerfile b/iso/empanadas/Containerfile index 3eb45c2..86a67c5 100644 --- a/iso/empanadas/Containerfile +++ b/iso/empanadas/Containerfile @@ -56,7 +56,7 @@ RUN rm -rf /etc/yum.repos.d/*.repo RUN useradd -o -d /var/peridot -u 1002 peridotbuilder && usermod -a -G mock peridotbuilder RUN chown peridotbuilder:mock /etc/yum.conf && chown -R peridotbuilder:mock /etc/dnf && chown -R peridotbuilder:mock /etc/rpm && chown -R peridotbuilder:mock /etc/yum.repos.d -RUN pip install 'git+https://git.rockylinux.org/release-engineering/public/toolkit.git@devel#egg=empanadas&subdirectory=iso/empanadas' +RUN pip install 'git+https://git.resf.org/sig_core/toolkit.git@devel#egg=empanadas&subdirectory=iso/empanadas' RUN pip install awscli diff --git a/iso/empanadas/Containerfile.imagefactory b/iso/empanadas/Containerfile.imagefactory index c370ebd..a66ccb6 100644 --- a/iso/empanadas/Containerfile.imagefactory +++ b/iso/empanadas/Containerfile.imagefactory @@ -53,15 +53,13 @@ RUN pip install awscli ENV BRANCH r9 RUN git clone https://git.rockylinux.org/rocky/kickstarts.git --branch $BRANCH /kickstarts -RUN cp /kickstarts/Rocky-9-Container.ks /kickstarts/Rocky-9-Container-Base.ks -RUN sed -i "s/\$basearch/$(uname -m)/" /kickstarts/Rocky-9-Container-Base.ks # devel only -COPY . /empanadas -RUN pip install -e /empanadas +# COPY . /empanadas +# RUN pip install -e /empanadas # prod -#RUN pip install 'git+https://git.rockylinux.org/release-engineering/public/toolkit.git@devel#egg=empanadas&subdirectory=iso/empanadas' +RUN pip install 'git+https://git.resf.org/sig_core/toolkit.git@devel#egg=empanadas&subdirectory=iso/empanadas' ENV LIBGUESTFS_BACKEND direct