github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-28 03:42:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1623 from egernst/custom-image-registry

Browse Source 
osbuilder: update dockerfiles to utilize IMAGE_REGISTRY
This commit is contained in:
Eric Ernst 2021-04-02 14:18:36 -07:00 committed by GitHub
commit d44412fe24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/osbuilder/image-builder/Dockerfile
View File

@ -2,8 +2,8 @@
# Copyright (c) 2018 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
From registry.fedoraproject.org/fedora:latest
ARG IMAGE_REGISTRY=registry.fedoraproject.org
FROM ${IMAGE_REGISTRY}/fedora:latest
RUN [ -n "$http_proxy" ] && sed -i '$ a proxy='$http_proxy /etc/dnf/dnf.conf ; true

3
tools/osbuilder/rootfs-builder/alpine/Dockerfile.in
View File

@ -3,7 +3,8 @@
#
# SPDX-License-Identifier: Apache-2.0
From docker.io/alpine:3.11.6
ARG IMAGE_REGISTRY=docker.io
FROM ${IMAGE_REGISTRY}/alpine:3.11.6
RUN apk update && apk add \
bash \

3
tools/osbuilder/rootfs-builder/centos/Dockerfile.in
View File

@ -3,7 +3,8 @@
#
# SPDX-License-Identifier: Apache-2.0
From registry.centos.org/centos:@OS_VERSION@
ARG IMAGE_REGISTRY=registry.centos.org
FROM ${IMAGE_REGISTRY}/centos:@OS_VERSION@
@SET_PROXY@

3
tools/osbuilder/rootfs-builder/clearlinux/Dockerfile.in
View File

@ -3,7 +3,8 @@
#
# SPDX-License-Identifier: Apache-2.0
From docker.io/fedora:30
ARG IMAGE_REGISTRY=docker.io
FROM ${IMAGE_REGISTRY}/fedora:30
@SET_PROXY@

3
tools/osbuilder/rootfs-builder/debian/Dockerfile-aarch64.in
View File

@ -3,8 +3,9 @@
#
# SPDX-License-Identifier: Apache-2.0
ARG IMAGE_REGISTRY=docker.io
# NOTE: OS_VERSION is set according to config.sh
from docker.io/debian:@OS_VERSION@
FROM ${IMAGE_REGISTRY}/debian:@OS_VERSION@
# RUN commands
RUN apt-get update && apt-get install -y \

3
tools/osbuilder/rootfs-builder/debian/Dockerfile.in
View File

@ -3,8 +3,9 @@
#
# SPDX-License-Identifier: Apache-2.0
ARG IMAGE_REGISTRY=docker.io
# NOTE: OS_VERSION is set according to config.sh
from docker.io/debian:@OS_VERSION@
FROM ${IMAGE_REGISTRY}/debian:@OS_VERSION@
# RUN commands
RUN apt-get update && apt-get --no-install-recommends install -y \

4
tools/osbuilder/rootfs-builder/fedora/Dockerfile.in
View File

@ -2,8 +2,8 @@
# Copyright (c) 2018 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
From registry.fedoraproject.org/fedora:@OS_VERSION@
ARG IMAGE_REGISTRY=registry.fedoraproject.org
FROM ${IMAGE_REGISTRY}/fedora:@OS_VERSION@
@SET_PROXY@

3
tools/osbuilder/rootfs-builder/gentoo/Dockerfile.in
View File

@ -3,7 +3,8 @@
#
# SPDX-License-Identifier: Apache-2.0
from docker.io/gentoo/stage3-amd64:latest
ARG IMAGE_REGISTRY=docker.io
FROM ${IMAGE_REGISTRY}/gentoo/stage3-amd64:latest
# This dockerfile needs to provide all the componets need to build a rootfs
# Install any package need to create a rootfs (package manager, extra tools)

3
tools/osbuilder/rootfs-builder/suse/Dockerfile.in
View File

@ -3,9 +3,10 @@
#
# SPDX-License-Identifier: Apache-2.0
ARG IMAGE_REGISTRY=docker.io
#suse: docker image to be used to create a rootfs
#@OS_VERSION@: Docker image version to build this dockerfile
from docker.io/opensuse/leap
FROM ${IMAGE_REGISTRY}/opensuse/leap
# This dockerfile needs to provide all the componets need to build a rootfs
# Install any package need to create a rootfs (package manager, extra tools)

3
tools/osbuilder/rootfs-builder/template/Dockerfile.template
View File

@ -4,8 +4,9 @@
# SPDX-License-Identifier: Apache-2.0
#@distro@: docker image to be used to create a rootfs
ARG IMAGE_REGISTRY=docker.io
#@OS_VERSION@: Docker image version to build this dockerfile
from @distro@:@OS_VERSION@
FROM ${IMAGE_REGISTRY}/@distro@:@OS_VERSION@
# This dockerfile needs to provide all the componets need to build a rootfs
# Install any package need to create a rootfs (package manager, extra tools)

3
tools/osbuilder/rootfs-builder/ubuntu/Dockerfile-aarch64.in
View File

@ -3,9 +3,10 @@
#
# SPDX-License-Identifier: Apache-2.0
ARG IMAGE_REGISTRY=docker.io
#ubuntu: docker image to be used to create a rootfs
#@OS_VERSION@: Docker image version to build this dockerfile
from docker.io/ubuntu:@OS_VERSION@
FROM ${IMAGE_REGISTRY}/ubuntu:@OS_VERSION@
# This dockerfile needs to provide all the componets need to build a rootfs
# Install any package need to create a rootfs (package manager, extra tools)

3
tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in
View File

@ -3,9 +3,10 @@
#
# SPDX-License-Identifier: Apache-2.0
ARG IMAGE_REGISTRY=docker.io
#ubuntu: docker image to be used to create a rootfs
#@OS_VERSION@: Docker image version to build this dockerfile
from docker.io/ubuntu:@OS_VERSION@
FROM ${IMAGE_REGISTRY}/ubuntu:@OS_VERSION@
# This dockerfile needs to provide all the componets need to build a rootfs
# Install any package need to create a rootfs (package manager, extra tools)