summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorAnatoli Babenia <anatoli@rainforce.org>2020-04-21 09:29:07 +0300
committerAnatoli Babenia <anatoli@rainforce.org>2020-04-21 14:58:37 +0300
commit05a5184302520438c6e3b13c14b5da4145dc01a0 (patch)
treee486a5ea1998b24027c9203c59ee75299209b482 /contrib
parent89276a5f92717c4c6a299ca2be182a3797d9c90d (diff)
downloadpodman-05a5184302520438c6e3b13c14b5da4145dc01a0.tar.gz
podman-05a5184302520438c6e3b13c14b5da4145dc01a0.tar.bz2
podman-05a5184302520438c6e3b13c14b5da4145dc01a0.zip
Move Fedora dependencies for building podman into separate file
This ones listed here are actual for Fedora 31. Signed-off-by: Anatoli Babenia <anatoli@rainforce.org>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/dependencies.txt34
-rw-r--r--contrib/gate/Dockerfile39
2 files changed, 39 insertions, 34 deletions
diff --git a/contrib/dependencies.txt b/contrib/dependencies.txt
new file mode 100644
index 000000000..5a6fa9834
--- /dev/null
+++ b/contrib/dependencies.txt
@@ -0,0 +1,34 @@
+# Fedora dependencies for building podman
+
+btrfs-progs-devel
+bzip2
+container-selinux
+containernetworking-cni
+device-mapper-devel
+findutils
+git
+glib2-devel
+glibc-static
+golang
+gpgme-devel
+iptables
+libassuan-devel
+libseccomp-devel
+libselinux-devel
+lsof
+make
+nmap-ncat
+procps-ng
+python
+python3-dateutil
+python3-pip
+python3-psutil
+python3-pytoml
+python3-pyyaml
+python3-varlink
+rsync
+slirp4netns
+unzip
+which
+xz
+zip
diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile
index 4fddae557..f7cd8f2b3 100644
--- a/contrib/gate/Dockerfile
+++ b/contrib/gate/Dockerfile
@@ -1,38 +1,4 @@
FROM fedora:31
-RUN dnf -y install \
- btrfs-progs-devel \
- bzip2 \
- container-selinux \
- containernetworking-cni \
- device-mapper-devel \
- findutils \
- git \
- glib2-devel \
- glibc-static \
- golang \
- gpgme-devel \
- iptables \
- libassuan-devel \
- libseccomp-devel \
- libselinux-devel \
- lsof \
- make \
- nmap-ncat \
- procps-ng \
- python \
- python3-dateutil \
- python3-pip \
- python3-psutil \
- python3-pytoml \
- python3-pyyaml \
- python3-varlink \
- rsync \
- slirp4netns \
- unzip \
- which \
- xz \
- zip \
- && dnf clean all
ENV GOPATH="/var/tmp/go" \
GOBIN="/var/tmp/go/bin" \
@@ -43,6 +9,11 @@ ENV GOPATH="/var/tmp/go" \
# Only needed for installing build-time dependencies, then will be removed
COPY / $GOSRC
+# Install packages from dependencies.txt, ignoring commented lines
+RUN dnf -y install \
+ $(grep "^[^#]" $GOSRC/contrib/dependencies.txt) \
+ && dnf clean all
+
# Install dependencies
RUN set -x && \
mkdir -p "$GOBIN" && \