Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Lumir Balhar
a2e0484f6c Remove temporary OSBS release tag 2020-07-16 06:52:32 +02:00
Lumir Balhar
b46fdd4f8b Add release LABEL to fix OSBS tags 2020-06-11 08:54:49 +02:00
Petr "Stone" Hracek
67e9052571 Add bot-cfg.yml file sync upstream s2i-core repository to Fedora land
This commit adds support for syncing upstream repository to Fedora land

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
2020-04-22 05:28:03 +00:00
Lumir Balhar
21a1c0875f Update from upstream Github repository 2020-04-20 08:51:32 +02:00
Petr Kubat
1139a197ee Pull changes from upstream and rebase for: rebuild for latest whatever
created from upstream commit: c0d5b29a3b3d25c01c7af38243d0d8a026a40399
2020-02-06 10:53:53 +01:00
Lumir Balhar
3257eddfca Switch to Fedora 31 2019-11-07 09:52:34 +01:00
3 changed files with 35 additions and 7 deletions

View file

@ -1,5 +1,5 @@
# This image is the base image for all OpenShift v3 language container images.
FROM registry.fedoraproject.org/f30/s2i-core:latest
FROM registry.fedoraproject.org/f31/s2i-core:latest
ENV SUMMARY="Base image with essential libraries and tools used as a base for \
builder images like perl, python, ruby, etc." \
@ -30,6 +30,7 @@ RUN INSTALL_PKGS="autoconf \
gdb \
git \
libcurl-devel \
libpq-devel \
libxml2-devel \
libxslt-devel \
lsof \
@ -38,7 +39,6 @@ RUN INSTALL_PKGS="autoconf \
npm \
openssl-devel \
patch \
libpq-devel \
procps-ng \
sqlite-devel \
unzip \

View file

@ -47,22 +47,23 @@ 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.
`podman 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
$ podman exec <cid> ... ruby
but must instead do:
$ docker exec <cid> ... /bin/bash -c ruby
$ podman 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.
Note: while the examples in this README are calling `podman`, you can replace any such calls by `docker` with the same arguments
Usage
------------------------
@ -82,7 +83,7 @@ $ make build VERSIONS=base TARGET=rhel7
This image is available on DockerHub. To download it run:
```console
docker pull sclorg/s2i-base-centos7
podman pull sclorg/s2i-base-centos7
```
To build a Base image from scratch run:
@ -101,4 +102,5 @@ 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.
The Dockerfile for CentOS is called Dockerfile, the Dockerfile for RHEL7 is called Dockerfile.rhel7,
the Dockerfile for RHEL8 is called Dockerfile.rhel8 and the Dockerfile for Fedora is Dockerfile.fedora.

26
bot-cfg.yml Normal file
View file

@ -0,0 +1,26 @@
version: "1"
betka:
# is betka enabled for this repository
# optional - defaults to false
enabled: true
# optional
notifications:
email_addresses: [phracek@redhat.com]
# Specify if master branch in upstream repository is synced
master_checker: true
# Should pull requests be synced?
# optional
pr_checker: false
# Either 'upstream_branch_name' or 'upstream_git_path' has to be specified
# Branch name which is used for sync
upstream_branch_name: master
# Path to directory with dockerfile withing upstream repository
upstream_git_path: "base"
# Github comment message to enforce sync of a pull request
# required if pr_checker is true otherwise optional
pr_comment_message: "[test]"
# optional
image_url: quay.io/rhscl/cwt-generator