From c3a2c5e437da14c8eb15684a7d8f413055a3ac5f Mon Sep 17 00:00:00 2001 From: Ben Breard Date: Tue, 6 Dec 2022 16:51:19 -0600 Subject: [PATCH] add golang golang is necessary if building ushift. Let's add it. Also, let's move the wget command to *after* it's installed. :) --- scripts/configure-builder | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/configure-builder b/scripts/configure-builder index 1128378..af9f00e 100755 --- a/scripts/configure-builder +++ b/scripts/configure-builder @@ -29,14 +29,11 @@ LIST2REMOVE=$(rpm -qa | egrep '^rpm-ostree' || true) sudo rm -rf /var/lib/osbuild-composer || true sudo rm -rf /var/cache/{osbuild-composer,osbuild-worker} || true -# Install the experimental rpm-ostree packages -sudo wget -P /etc/yum.repos.d https://copr.fedorainfracloud.org/coprs/walters/ostreerhel8/repo/centos-stream-8/walters-ostreerhel8-centos-stream-8.repo - title "Installing ImageBuilder tools" sudo dnf install -y \ osbuild-composer composer-cli cockpit-composer \ bash-completion podman genisoimage syslinux \ - createrepo syslinux yum-utils selinux-policy-devel jq wget lorax rpm-build + createrepo syslinux yum-utils selinux-policy-devel jq wget lorax rpm-build golang title "Starting osbuild-composer and cockpit services and configuring firewall" sudo systemctl enable osbuild-composer.socket --now @@ -44,6 +41,9 @@ sudo systemctl enable cockpit.socket --now sudo firewall-cmd -q --add-service=cockpit --permanent sudo firewall-cmd --reload +# Install the experimental rpm-ostree packages +sudo wget -P /etc/yum.repos.d https://copr.fedorainfracloud.org/coprs/walters/ostreerhel8/repo/centos-stream-8/walters-ostreerhel8-centos-stream-8.repo + # Temporary workaround until the rhocp-4.12-for-rhel-8-$(uname -i)-rpms repo can be used title "Configuring 4.12 beta repo" sudo tee /etc/yum.repos.d/rhocp-4.12-el8-beta-$(uname -i)-rpms.repo >/dev/null <