From ff6bc9edb9ebd0c8151faa173339780ba924ae6f Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 13 Jul 2020 10:59:07 +0200
Subject: move rpm install to configure-podman

---
 .gitlab-ci.yml   | 1 -
 Dockerfile       | 4 ----
 configure-podman | 5 +++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b12a86..e2a6202 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ stages:
 Build:
   stage: build
   script:
-    - dnf install -y podman buildah
     - ./configure-podman
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - docker build --tag $CI_REGISTRY_IMAGE:latest .
diff --git a/Dockerfile b/Dockerfile
index 56fefc4..152a35c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,9 +9,5 @@ LABEL maintainer="Gerd Hoffmann <kraxel@redhat.com>" \
 
 USER root
 
-RUN dnf update -y && \
-    dnf install -y podman podman-docker buildah && \
-    dnf clean all -y
-
 COPY configure-podman /root
 RUN /root/configure-podman
diff --git a/configure-podman b/configure-podman
index dce3b09..3992043 100755
--- a/configure-podman
+++ b/configure-podman
@@ -3,6 +3,11 @@
 # need to tweak some config options so "podman build" can run inside a container
 #
 
+# update & install packages
+dnf update -y
+dnf install -y podman podman-docker buildah
+dnf clean all -y
+
 # storage: can't use overlay (can't be stacked).
 sed -i.orig -e '/^driver/s/overlay/vfs/' /etc/containers/storage.conf
 diff -u /etc/containers/storage.conf.orig /etc/containers/storage.conf
-- 
cgit