Compare commits
9 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
888171c189 | ||
|
5704f4271e | ||
|
d00360044d | ||
|
ab91545549 | ||
|
|
eb7621e006 | ||
|
1c6503b128 | ||
|
16612a9798 |
||
|
|
325617e6e4 |
||
|
21e4d17ea5 |
7 changed files with 1 additions and 385 deletions
0
.gitignore
vendored
0
.gitignore
vendored
53
Dockerfile
53
Dockerfile
|
|
@ -1,53 +0,0 @@
|
|||
# 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 \
|
||||
RELEASE=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" \
|
||||
release="$RELEASE.$DISTTAG" \
|
||||
architecture="$ARCH" \
|
||||
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
|
||||
202
LICENSE
202
LICENSE
|
|
@ -1,202 +0,0 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
104
README.md
104
README.md
|
|
@ -1,104 +0,0 @@
|
|||
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.
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
container sources not used for building fedora containers anymore
|
||||
0
sources
0
sources
26
test/run
26
test/run
|
|
@ -1,26 +0,0 @@
|
|||
#!/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 $?
|
||||
Loading…
Add table
Add a link
Reference in a new issue