Merge pull request #22 from harche/repo_url

scripts: Arch dependent repo url for fedora
This commit is contained in:
Jose Carlos Venegas Munoz 2018-01-22 14:36:16 -06:00 committed by GitHub
commit 18d25ca005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions

View File

@ -1,3 +1,3 @@
From fedora:27 From fedora:27
RUN dnf -y update && dnf install -y git golang systemd pkgconfig RUN dnf -y update && dnf install -y git golang redhat-release systemd pkgconfig

View File

@ -28,9 +28,9 @@ installonly_limit=3
reposdir=/root/mash reposdir=/root/mash
[kata] [kata]
name=fedora name=Fedora \$releasever - \$basearch
failovermethod=priority failovermethod=priority
baseurl=${REPO_URL} metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-\$releasever&arch=\$basearch
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
EOF EOF
@ -41,10 +41,6 @@ build_rootfs()
# Mandatory # Mandatory
local ROOTFS_DIR=$1 local ROOTFS_DIR=$1
#In case rootfs is created usig repositories allow user to modify
# the default URL
local REPO_URL=${REPO_URL:-http://mirror.math.princeton.edu/pub/fedora/linux/releases/$OS_VERSION/Everything/x86_64/os/}
# In case of support EXTRA packages, use it to allow # In case of support EXTRA packages, use it to allow
# users add more packages to the base rootfs # users add more packages to the base rootfs
local EXTRA_PKGS=${EXTRA_PKGS:-""} local EXTRA_PKGS=${EXTRA_PKGS:-""}
@ -70,8 +66,6 @@ build_rootfs()
die "neither yum nor dnf is installed" die "neither yum nor dnf is installed"
fi fi
info "Using : ${PKG_MANAGER} to pull packages from ${REPO_URL}"
DNF="${PKG_MANAGER} --config=$DNF_CONF -y --installroot=${ROOTFS_DIR} --noplugins" DNF="${PKG_MANAGER} --config=$DNF_CONF -y --installroot=${ROOTFS_DIR} --noplugins"
$DNF install ${EXTRA_PKGS} ${PACKAGES} $DNF install ${EXTRA_PKGS} ${PACKAGES}