Add versioned symlink - needed by some images.

Pull changes from upstream repository.
Drop Release label in favor of OSBS release_bump plugin.
2018-10-29 14:11:03 +00:00 · 2018-10-29 09:35:10 +00:00 · 2018-08-27 10:35:39 +02:00 · 2018-07-24 18:51:17 +00:00 · 2018-07-24 17:28:02 +02:00 · 2018-07-24 16:23:18 +02:00
4 changed files with 5 additions and 5 deletions
--- a/7
+++ b/7
@ -1,5 +1,5 @@
 # This image is the base image for all s2i configurable container images.
-FROM registry.fedoraproject.org/fedora:29
+FROM registry.fedoraproject.org/fedora:28

 ENV SUMMARY="Base image which allows using of source-to-image."	\
    DESCRIPTION="The s2i-core image provides any images layered on top of it \
@ -7,7 +7,6 @@ with all the tools needed to use source-to-image functionality while keeping \
 the image size as small as possible." \
    NAME=s2i-core \
    VERSION=0 \
-    RELEASE=3 \
    ARCH=x86_64

 LABEL summary="$SUMMARY" \
@ -19,8 +18,6 @@ LABEL summary="$SUMMARY" \
      com.redhat.component="$NAME" \
      name="$FGC/$NAME" \
      version="$VERSION" \
-      release="$RELEASE.$DISTTAG" \
-      architecture="$ARCH" \
      usage="This image is supposed to be used as a base image for other images that support source-to-image" \
      maintainer="SoftwareCollections.org <sclorg@redhat.com>"

@ -42,7 +39,7 @@ ENV \
 RUN INSTALL_PKGS="bsdtar \
  findutils \
  gettext \
-  groff \
+  groff-base \
  tar \
  unzip" && \
  mkdir -p ${HOME}/.pki/nssdb && \
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@ -0,0 +1 @@
+Dockerfile
--- a/1
+++ b/1
@ -0,0 +1 @@
+.
--- a/help.md
+++ b/help.md
@ -0,0 +1 @@
+README.md
Author	SHA1	Message	Date
Marek Skalický	d52ccdfb96	Add versioned symlink - needed by some images.	2018-10-29 14:11:03 +00:00
Marek Skalický	264acb0ff2	Pull changes from upstream repository.	2018-10-29 09:35:10 +00:00
Clement Verna	87387b4692	Drop Release label in favor of OSBS release_bump plugin. OSBS can automatically bump the release number, for that we just need to drop the label from the Dockerfile See https://pagure.io/ContainerSIG/container-sig/issue/1 Signed-off-by: Clement Verna <cverna@tutanota.com>	2018-08-27 10:35:39 +02:00
Mohan Boddu	8c10bb4527	"Bump RELEASE for automatic rebuild"	2018-07-24 18:51:17 +00:00
Honza Horak	7b53515465	Use just groff-base in s2i-core	2018-07-24 17:28:02 +02:00
Honza Horak	a9f5ccd60b	Merge branch 'master' into f28	2018-07-24 16:23:18 +02:00
Mohan Boddu	5509f0026d	"Bump RELEASE for automatic rebuild"	2018-07-23 13:09:44 +00:00
Mohan Boddu	b8e0f1b599	"Bump RELEASE for automatic rebuild"	2018-07-09 13:31:43 +00:00
Honza Horak	a62acf4707	Pull changes from upstream master (3bb932c)	2018-06-27 12:29:59 +02:00
Mohan Boddu	1b5cf8b7c0	"Bump RELEASE for automatic rebuild"	2018-05-30 19:20:23 +00:00
Mohan Boddu	05edf6d87c	"Bump RELEASE for automatic rebuild"	2018-05-21 17:56:12 +00:00
Mohan Boddu	ba6bad827c	"Bump RELEASE for automatic rebuild"	2018-05-21 14:19:22 +00:00
Honza Horak	6f8099e9dd	Bump the release	2018-05-04 08:53:14 +02:00