Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.2] Changes to support F31 in Dockerfile #1121

Closed
wants to merge 3 commits into from
Closed

[4.2] Changes to support F31 in Dockerfile #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69c41d4
build: Use /etc/os-release rather than hardcoding distro version
cgwalters Oct 23, 2019
068e7fb
deps.txt: switch to python3 dependencies
Aug 28, 2019
dd85ec6
Dockerfile: bump to F31
miabbott Feb 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:30
FROM registry.fedoraproject.org/fedora:31
WORKDIR /root/containerbuild

# Only need a few of our scripts for the first few steps
Expand Down
15 changes: 6 additions & 9 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,13 @@ fi
set -x
srcdir=$(pwd)

release="30"

configure_yum_repos() {
if [ -n "${ISFEDORA}" ]; then
# Add continuous tag for latest build tools and mark as required so we
# can depend on those latest tools being available in all container
# builds.
echo -e "[f$release-coreos-continuous]\nenabled=1\nmetadata_expire=1m\nbaseurl=https://kojipkgs.fedoraproject.org/repos-dist/f$release-coreos-continuous/latest/\$basearch/\ngpgcheck=0\nskip_if_unavailable=False\n" > /etc/yum.repos.d/coreos.repo

fi
local version_id
version_id=$(. /etc/os-release && echo ${VERSION_ID})
# Add continuous tag for latest build tools and mark as required so we
# can depend on those latest tools being available in all container
# builds.
echo -e "[f${version_id}-coreos-continuous]\nenabled=1\nmetadata_expire=1m\nbaseurl=https://kojipkgs.fedoraproject.org/repos-dist/f${version_id}-coreos-continuous/latest/\$basearch/\ngpgcheck=0\nskip_if_unavailable=False\n" > /etc/yum.repos.d/coreos.repo
}

install_rpms() {
Expand Down
2 changes: 1 addition & 1 deletion src/deps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ ShellCheck
python3-flake8 python3-pytest python3-pytest-cov

# Support for Koji uploads.
krb5-libs krb5-workstation python2-koji python2-krbv
krb5-libs krb5-workstation koji-utils python3-koji python3-koji-cli-plugins