mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-04-30 12:44:39 +00:00
osbuilder: delint dockerfiles
Removed all errors/warnings pointed out by hadolint version 2.7.0, except for the following ignored rules: - "DL3008 warning: Pin versions in apt get install" - "DL3041 warning: Specify version with `dnf install -y <package>-<version>`" - "DL3033 warning: Specify version with `yum install -y <package>-<version>`" - "DL3048 style: Invalid label key" - "DL3003 warning: Use WORKDIR to switch to a directory" - "DL3018 warning: Pin versions in apk add. Instead of apk add <package> use apk add <package>=<version>" - "DL3037 warning: Specify version with zypper install -y <package>[=]<version>" Fixes #3107 Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
This commit is contained in:
parent
bc120289ec
commit
aeb2b673b3
@ -42,7 +42,8 @@ RUN dnf install -y \
|
|||||||
systemd-devel \
|
systemd-devel \
|
||||||
sudo \
|
sudo \
|
||||||
xz \
|
xz \
|
||||||
yasm
|
yasm && \
|
||||||
|
dnf clean all
|
||||||
|
|
||||||
# Add in non-privileged user
|
# Add in non-privileged user
|
||||||
RUN useradd qatbuilder -p "" && \
|
RUN useradd qatbuilder -p "" && \
|
||||||
|
@ -3,8 +3,13 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
|
# openSUSE Tumbleweed image has only 'latest' tag so ignore DL3006 rule.
|
||||||
|
# hadolint ignore=DL3006
|
||||||
from opensuse/tumbleweed
|
from opensuse/tumbleweed
|
||||||
|
|
||||||
|
# zypper -y or --non-interactive can be used interchangeably here so ignore
|
||||||
|
# DL3034 rule.
|
||||||
|
# hadolint ignore=DL3034
|
||||||
RUN zypper --non-interactive refresh; \
|
RUN zypper --non-interactive refresh; \
|
||||||
zypper --non-interactive install --no-recommends --force-resolution \
|
zypper --non-interactive install --no-recommends --force-resolution \
|
||||||
autoconf \
|
autoconf \
|
||||||
|
@ -5,6 +5,14 @@
|
|||||||
ARG IMAGE_REGISTRY=registry.fedoraproject.org
|
ARG IMAGE_REGISTRY=registry.fedoraproject.org
|
||||||
FROM ${IMAGE_REGISTRY}/fedora:34
|
FROM ${IMAGE_REGISTRY}/fedora:34
|
||||||
|
|
||||||
RUN [ -n "$http_proxy" ] && sed -i '$ a proxy='$http_proxy /etc/dnf/dnf.conf ; true
|
RUN ([ -n "$http_proxy" ] && \
|
||||||
|
sed -i '$ a proxy='$http_proxy /etc/dnf/dnf.conf ; true) && \
|
||||||
RUN dnf install -y qemu-img parted gdisk e2fsprogs gcc xfsprogs findutils
|
dnf install -y \
|
||||||
|
e2fsprogs \
|
||||||
|
findutils \
|
||||||
|
gcc \
|
||||||
|
gdisk \
|
||||||
|
parted \
|
||||||
|
qemu-img \
|
||||||
|
xfsprogs && \
|
||||||
|
dnf clean all
|
||||||
|
@ -32,7 +32,8 @@ RUN yum -y update && yum install -y \
|
|||||||
sed \
|
sed \
|
||||||
tar \
|
tar \
|
||||||
vim \
|
vim \
|
||||||
which
|
which && \
|
||||||
|
yum clean all
|
||||||
|
|
||||||
# This will install the proper packages to build Kata components
|
# This will install the proper packages to build Kata components
|
||||||
@INSTALL_MUSL@
|
@INSTALL_MUSL@
|
||||||
|
@ -35,7 +35,8 @@ RUN dnf -y update && dnf install -y \
|
|||||||
systemd \
|
systemd \
|
||||||
tar \
|
tar \
|
||||||
vim \
|
vim \
|
||||||
which
|
which && \
|
||||||
|
dnf clean all
|
||||||
|
|
||||||
# This will install the proper packages to build Kata components
|
# This will install the proper packages to build Kata components
|
||||||
@INSTALL_MUSL@
|
@INSTALL_MUSL@
|
||||||
|
@ -35,7 +35,8 @@ RUN dnf -y update && dnf install -y \
|
|||||||
systemd \
|
systemd \
|
||||||
tar \
|
tar \
|
||||||
vim \
|
vim \
|
||||||
which
|
which && \
|
||||||
|
dnf clean all
|
||||||
|
|
||||||
# This will install the proper packages to build Kata components
|
# This will install the proper packages to build Kata components
|
||||||
@INSTALL_MUSL@
|
@INSTALL_MUSL@
|
||||||
|
@ -4,6 +4,8 @@
|
|||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
ARG IMAGE_REGISTRY=docker.io
|
ARG IMAGE_REGISTRY=docker.io
|
||||||
|
# stage3-amd64 image has only 'latest' tag so ignore DL3006 rule.
|
||||||
|
# hadolint ignore=DL3007
|
||||||
FROM ${IMAGE_REGISTRY}/gentoo/stage3-amd64:latest
|
FROM ${IMAGE_REGISTRY}/gentoo/stage3-amd64:latest
|
||||||
|
|
||||||
# This dockerfile needs to provide all the componets need to build a rootfs
|
# This dockerfile needs to provide all the componets need to build a rootfs
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
ARG IMAGE_REGISTRY=docker.io
|
ARG IMAGE_REGISTRY=docker.io
|
||||||
#suse: docker image to be used to create a rootfs
|
#suse: docker image to be used to create a rootfs
|
||||||
#@OS_VERSION@: Docker image version to build this dockerfile
|
#@OS_VERSION@: Docker image version to build this dockerfile
|
||||||
FROM ${IMAGE_REGISTRY}/opensuse/leap
|
FROM ${IMAGE_REGISTRY}/opensuse/leap:15.0
|
||||||
|
|
||||||
# This dockerfile needs to provide all the componets need to build a rootfs
|
# 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)
|
# Install any package need to create a rootfs (package manager, extra tools)
|
||||||
|
@ -35,7 +35,9 @@ RUN apt-get update && apt-get install -y \
|
|||||||
sed \
|
sed \
|
||||||
systemd \
|
systemd \
|
||||||
tar \
|
tar \
|
||||||
vim
|
vim && \
|
||||||
|
apt-get clean && rm -rf /var/lib/apt/lists/
|
||||||
|
|
||||||
# This will install the proper packages to build Kata components
|
# This will install the proper packages to build Kata components
|
||||||
@INSTALL_MUSL@
|
@INSTALL_MUSL@
|
||||||
@INSTALL_RUST@
|
@INSTALL_RUST@
|
||||||
|
Loading…
Reference in New Issue
Block a user