Pull changes from upstream repository

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>

Dockerfile

@@ -0,0 +1,50 @@
+# This image is the base image for all OpenShift v3 language container images.
+FROM registry.fedoraproject.org/f29/s2i-core:latest
+
+ENV SUMMARY="Base image with essential libraries and tools used as a base for \
+builder images like perl, python, ruby, etc." \
+    DESCRIPTION="The s2i-base image, being built upon s2i-core, provides any \
+images layered on top of it with all the tools needed to use source-to-image \
+functionality. Additionally, s2i-base also contains various libraries needed for \
+it to serve as a base for other builder images, like s2i-python or s2i-ruby." \
+    NAME=s2i-base \
+    VERSION=1 \
+    ARCH=x86_64
+
+LABEL summary="$SUMMARY" \
+      description="$DESCRIPTION" \
+      io.k8s.description="$DESCRIPTION" \
+      io.k8s.display-name="s2i base" \
+      com.redhat.component="$NAME" \
+      name="$FGC/$NAME" \
+      version="$VERSION" \
+      maintainer="SoftwareCollections.org <sclorg@redhat.com>"
+
+# This is the list of basic dependencies that all language container image can
+# consume.
+RUN INSTALL_PKGS="autoconf \
+  automake \
+  bzip2 \
+  gcc-c++ \
+  gd-devel \
+  gdb \
+  git \
+  libcurl-devel \
+  libxml2-devel \
+  libxslt-devel \
+  lsof \
+  make \
+  mariadb-connector-c-devel \
+  npm \
+  openssl-devel \
+  patch \
+  postgresql-devel \
+  procps-ng \
+  sqlite-devel \
+  unzip \
+  wget \
+  which \
+  zlib-devel" && \
+  dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+  rpm -V $INSTALL_PKGS && \
+  dnf clean all -y

Dockerfile.fedora

@@ -0,0 +1 @@
+Dockerfile

README.md

@@ -0,0 +1,104 @@
+OpenShift base images
+========================================
+
+This repository contains Dockerfiles for images which serve as base images with all the
+essential libraries and tools needed for OpenShift language images, for example:
+
+* [s2i-ruby](https://github.com/sclorg/s2i-ruby-container)
+* [s2i-nodejs](https://github.com/sclorg/s2i-nodejs-container)
+* [s2i-python](https://github.com/sclorg/s2i-python-container)
+* [s2i-perl](https://github.com/sclorg/s2i-perl-container)
+* [s2i-php](https://github.com/sclorg/s2i-php-container)
+
+This container image also installs several development libraries, that are
+often required in the builder images above. It also includes NPM package manager.
+Sharing those development packages in a common layer saves disk space and
+improves pulling speed.
+
+NPM, a package manager for Node.js, offers a pleasant way to install JavaScript
+libraries, that are often needed as static files for various web applications.
+In order to offer good experience for web developers, the NPM package manager
+is also installed in the image.
+
+For containers where the development libraries and NPM package manager are not
+necessary, users are advised to use the s2i-core variant of this container image.
+
+
+Description
+-----------
+
+OpenShift S2I images use [Software Collections](https://www.softwarecollections.org/en/)
+packages to provide the latest versions of various software.
+The SCL packages are released more frequently than the RHEL or CentOS systems,
+which are unlikely to change for several years.
+We rely on RHEL and CentOS for base images, on the other hand,
+because those are stable, supported, and secure platforms.
+
+Normally, SCL requires manual operation to enable the collection you want to use.
+This is burdensome and can be prone to error.
+The OpenShift S2I approach is to set Bash environment variables that
+serve to automatically enable the desired collection:
+
+* `BASH_ENV`: enables the collection for all non-interactive Bash sessions
+* `ENV`: enables the collection for all invocations of `/bin/sh`
+* `PROMPT_COMMAND`: enables the collection in interactive shell
+
+Two examples:
+* If you specify `BASH_ENV`, then all your `#!/bin/bash` scripts
+do not need to call `scl enable`.
+* If you specify `PROMPT_COMMAND`, then on execution of the
+`docker exec ... /bin/bash` command, the collection will be automatically enabled.
+
+*Note*:
+Executables in Software Collections packages (e.g., `ruby`)
+are not directly in a directory named in the `PATH` environment variable.
+This means that you cannot do:
+
+    $ docker exec <cid> ... ruby
+
+but must instead do:
+
+    $ docker exec <cid> ... /bin/bash -c ruby
+
+The `/bin/bash -c`, along with the setting the appropriate environment variable,
+ensures the correct `ruby` executable is found and invoked.
+
+
+Usage
+------------------------
+Choose either the CentOS7 or RHEL7 base image:
+*  **RHEL7 base image**
+
+To build a RHEL7 based image, you need to build it on properly subscribed RHEL machine.
+
+```
+$ git clone --recursive https://github.com/sclorg/s2i-base-container.git
+$ cd s2i-base-container
+$ make build VERSIONS=base TARGET=rhel7
+```
+
+*  **CentOS7 base image**
+
+This image is available on DockerHub. To download it run:
+
+```console
+docker pull sclorg/s2i-base-centos7
+```
+
+To build a Base image from scratch run:
+
+```
+$ git clone --recursive https://github.com/sclorg/s2i-base-container.git
+$ cd s2i-base-container
+$ make build VERSIONS=base
+```
+
+**Notice: By omitting the `VERSION` parameter, the build/test action will be performed
+on all provided versions of s2i image.**
+
+
+See also
+--------
+Dockerfile and other sources are available on https://github.com/sclorg/s2i-base-container.
+In that repository you also can find another variants of S2I base Dockerfiles.
+Dockerfile for CentOS is called Dockerfile, Dockerfile for RHEL is called Dockerfile.rhel7.

base

@@ -0,0 +1 @@
+.

dead.package

@@ -1 +0,0 @@
-container sources not used for building fedora containers anymore

help.md

@@ -0,0 +1 @@
+README.md

test/run

@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# The 'run' performs a simple test that verifies that STI image.
+# The main focus is that the image prints out the base-usage properly.
+#
+# IMAGE_NAME specifies a name of the candidate image used for testing.
+# The image has to be available before this script is executed.
+#
+IMAGE_NAME=${IMAGE_NAME-centos/s2i-base-centos7-candidate}
+
+test_docker_run_usage() {
+	echo "Testing 'docker run' usage..."
+	docker run --rm ${IMAGE_NAME} &>/dev/null
+}
+
+check_result() {
+	local result="$1"
+	if [[ "$result" != "0" ]]; then
+		echo "STI image '${IMAGE_NAME}' test FAILED (exit code: ${result})"
+		exit $result
+	fi
+}
+
+# Verify the 'usage' script is working properly when running the base image with 'docker run ...'
+test_docker_run_usage
+check_result $?