github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity

builder: support proxy in distros based on yum or dnf

Browse Source 
proxy server must be specified in configuration file
of the package manager, /etc/yum.conf for yum or
/etc/dnf/dnf.conf for dnf

fixes #123

Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2018-06-26 09:59:49 -05:00
parent ae5b40ab88
commit 52d015e283
6 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
image-builder/Dockerfile
View File

@ -1,3 +1,10 @@
#
# Copyright (c) 2018 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
From fedora:latest From fedora:latest
RUN [ -n "$http_proxy" ] && sed -i '$ a proxy='$http_proxy /etc/dnf/dnf.conf ; true
RUN dnf install -y qemu-img parted gdisk e2fsprogs RUN dnf install -y qemu-img parted gdisk e2fsprogs

2
rootfs-builder/centos/Dockerfile.in
View File

@ -5,6 +5,8 @@
From centos:@OS_VERSION@ From centos:@OS_VERSION@
@SET_PROXY@
RUN yum -y update && yum install -y git make gcc coreutils RUN yum -y update && yum install -y git make gcc coreutils
# This will install the proper golang to build Kata components # This will install the proper golang to build Kata components

2
rootfs-builder/clearlinux/Dockerfile.in
View File

@ -5,6 +5,8 @@
From fedora:27 From fedora:27
@SET_PROXY@
RUN dnf -y update && dnf install -y git systemd pkgconfig gcc coreutils RUN dnf -y update && dnf install -y git systemd pkgconfig gcc coreutils
# This will install the proper golang to build Kata components # This will install the proper golang to build Kata components

2
rootfs-builder/euleros/Dockerfile.in
View File

@ -5,6 +5,8 @@
FROM euleros:@OS_VERSION@ FROM euleros:@OS_VERSION@
@SET_PROXY@
RUN yum -y update && yum install -y yum git make gcc coreutils RUN yum -y update && yum install -y yum git make gcc coreutils
# This will install the proper golang to build Kata components # This will install the proper golang to build Kata components

2
rootfs-builder/fedora/Dockerfile.in
View File

@ -5,6 +5,8 @@
From fedora:@OS_VERSION@ From fedora:@OS_VERSION@
@SET_PROXY@
RUN dnf -y update && dnf install -y git redhat-release systemd pkgconfig gcc coreutils RUN dnf -y update && dnf install -y git redhat-release systemd pkgconfig gcc coreutils
# This will install the proper golang to build Kata components # This will install the proper golang to build Kata components

3
rootfs-builder/rootfs.sh
View File

@ -100,6 +100,8 @@ generate_dockerfile()
;; ;;
esac esac
[ -n "$http_proxy" ] && readonly set_proxy="RUN sed -i '$ a proxy="$http_proxy"' /etc/dnf/dnf.conf /etc/yum.conf; true"
readonly install_go=" readonly install_go="
ADD https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${goarch}.tar.gz /tmp ADD https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${goarch}.tar.gz /tmp
RUN tar -C /usr/ -xzf /tmp/go${GO_VERSION}.linux-${goarch}.tar.gz RUN tar -C /usr/ -xzf /tmp/go${GO_VERSION}.linux-${goarch}.tar.gz
@ -115,6 +117,7 @@ ENV PATH=\$PATH:\$GOROOT/bin:\$GOPATH/bin
-e "s|@GO_VERSION@|${GO_VERSION}|g" \ -e "s|@GO_VERSION@|${GO_VERSION}|g" \
-e "s|@OS_VERSION@|${OS_VERSION}|g" \ -e "s|@OS_VERSION@|${OS_VERSION}|g" \
-e "s|@INSTALL_GO@|${install_go//$'\n'/\\n}|g" \ -e "s|@INSTALL_GO@|${install_go//$'\n'/\\n}|g" \
-e "s|@SET_PROXY@|${set_proxy}|g" \
${dockerfile_template} > Dockerfile ${dockerfile_template} > Dockerfile
popd popd
} }