Commit 59de540b authored by Michel Dänzer's avatar Michel Dänzer Committed by Michel Dänzer
Browse files

Make sure wildcards don't get expanded too early

The Alpine/Debian/Ubuntu package list wildcards were getting expanded
by the top-level job shell, so they didn't match anything in the
container, resulting in larger than necessary images.

Fixes: 2b8cc139

 "generate the CI templates based on a template"
Signed-off-by: Michel Dänzer's avatarMichel Dänzer <mdaenzer@redhat.com>
parent 322bf2b8
......@@ -13,5 +13,5 @@ alpine:
- apk add
clean:
- rm -f /var/cache/apk/APKINDEX.*
- sh -c 'rm -f /var/cache/apk/APKINDEX.*'
......@@ -25,7 +25,7 @@ debian:
clean:
- env DEBIAN_FRONTEND=noninteractive apt-get clean
- rm -f /var/lib/apt/lists/*.lz4
- sh -c 'rm -f /var/lib/apt/lists/*.lz4'
qemu_packages:
- openssh-client
......
......@@ -8,7 +8,7 @@ fedora:
- '33' # rawhide
upgrade:
- dnf upgrade -y --setopt=install_weak_deps=False --nogpgcheck fedora-release fedora-repos*
- dnf upgrade -y --setopt=install_weak_deps=False --nogpgcheck fedora-release 'fedora-repos*'
- dnf upgrade -y --setopt=install_weak_deps=False
install:
......
......@@ -23,7 +23,7 @@ ubuntu:
clean:
- env DEBIAN_FRONTEND=noninteractive apt-get clean
- rm -f /var/lib/apt/lists/*.lz4
- sh -c 'rm -f /var/lib/apt/lists/*.lz4'
qemu_packages:
- openssh-client
......
......@@ -238,7 +238,7 @@
fi
# do not store the packages database, it's pointless
- $BUILDAH_RUN $buildcntr rm -f /var/cache/apk/APKINDEX.*
- $BUILDAH_RUN $buildcntr sh -c 'rm -f /var/cache/apk/APKINDEX.*'
# set up the working directory
- mkdir -p $buildmnt/app
......
......@@ -253,7 +253,7 @@
# do not store the packages database, it's pointless
- $BUILDAH_RUN $buildcntr env DEBIAN_FRONTEND=noninteractive apt-get clean
- $BUILDAH_RUN $buildcntr rm -f /var/lib/apt/lists/*.lz4
- $BUILDAH_RUN $buildcntr sh -c 'rm -f /var/lib/apt/lists/*.lz4'
# set up the working directory
- mkdir -p $buildmnt/app
......
......@@ -211,7 +211,7 @@
- buildcntr=$(buildah from $BASE_IMAGE)
- buildmnt=$(buildah mount $buildcntr)
- $BUILDAH_RUN $buildcntr dnf upgrade -y --setopt=install_weak_deps=False --nogpgcheck fedora-release fedora-repos*
- $BUILDAH_RUN $buildcntr dnf upgrade -y --setopt=install_weak_deps=False --nogpgcheck fedora-release 'fedora-repos*'
- $BUILDAH_RUN $buildcntr dnf upgrade -y --setopt=install_weak_deps=False
- if [[ x"$FDO_DISTRIBUTION_PACKAGES" != x"" ]] ;
......
......@@ -252,7 +252,7 @@
# do not store the packages database, it's pointless
- $BUILDAH_RUN $buildcntr env DEBIAN_FRONTEND=noninteractive apt-get clean
- $BUILDAH_RUN $buildcntr rm -f /var/lib/apt/lists/*.lz4
- $BUILDAH_RUN $buildcntr sh -c 'rm -f /var/lib/apt/lists/*.lz4'
# set up the working directory
- mkdir -p $buildmnt/app
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment