diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-07-13 10:59:07 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-07-13 10:59:07 +0200 |
| commit | ff6bc9edb9ebd0c8151faa173339780ba924ae6f (patch) | |
| tree | 5aad1845bc899e8a89d29cb104f7a0660a3ac7fc | |
| parent | 500167be46d965b50eba5d9214d88bdceac64c0a (diff) | |
| download | podman-docker-builder-ff6bc9edb9ebd0c8151faa173339780ba924ae6f.tar.gz | |
move rpm install to configure-podman
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rwxr-xr-x | 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 . @@ -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 |