From 2702c5d9f35a0ed87ad7f82598f5cdad742f4eff Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 21 Aug 2018 09:00:26 +0200 Subject: [PATCH 1/2] multiple: * bump to F29 * remove "release" * get rid of $FGC Signed-off-by: Tomas Tomecek --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f638a5a..1c06479 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ -FROM registry.fedoraproject.org/fedora:28 +FROM registry.fedoraproject.org/fedora:29 LABEL maintainer "Tomas Tomecek \"ttomecek@redhat.com\"" -ENV NAME=systemtap VERSION=0 RELEASE=1 ARCH=x86_64 +ENV NAME=systemtap VERSION=0 ARCH=x86_64 LABEL com.redhat.component="$NAME" \ - name="$FGC/$NAME" \ + name="$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ run="docker run --security-opt label:disable --cap-add SYS_MODULE -v /sys/kernel/debug:/sys/kernel/debug -v /usr/src/kernels:/usr/src/kernels -v /usr/lib/modules/:/usr/lib/modules/ -v /usr/lib/debug:/usr/lib/debug -t -i --name NAME IMAGE" \ summary="programmable system-wide instrumentation system" From ebe1d3b9e66abb65b7eff97077ebcc5af17abd00 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 21 Aug 2018 09:00:26 +0200 Subject: [PATCH 2/2] bump to F29 & remove release label Signed-off-by: Tomas Tomecek --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f638a5a..5797371 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ -FROM registry.fedoraproject.org/fedora:28 +FROM registry.fedoraproject.org/fedora:29 LABEL maintainer "Tomas Tomecek \"ttomecek@redhat.com\"" -ENV NAME=systemtap VERSION=0 RELEASE=1 ARCH=x86_64 +ENV NAME=systemtap VERSION=0 ARCH=x86_64 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ run="docker run --security-opt label:disable --cap-add SYS_MODULE -v /sys/kernel/debug:/sys/kernel/debug -v /usr/src/kernels:/usr/src/kernels -v /usr/lib/modules/:/usr/lib/modules/ -v /usr/lib/debug:/usr/lib/debug -t -i --name NAME IMAGE" \ summary="programmable system-wide instrumentation system"