Skip to content

Commit 2fcdb5b

Browse files
hhorakhhorak
authored
Merge pull request sclorg#135 from hhorak/osbs-compliant
Comment between LABEL lines breaks OSBS builds
2 parents ee0fb8a + 4143cb9 commit 2fcdb5b

4 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎2.7/Dockerfile.rhel7‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ EXPOSE 8080
77
ENV PYTHON_VERSION=2.7 \
88
PATH=$HOME/.local/bin/:$PATH
99

10-
LABEL io.k8s.description="Platform for building and running Python 2.7 applications" \
11-
io.k8s.display-name="Python 2.7" \
12-
io.openshift.expose-services="8080:http" \
13-
io.openshift.tags="builder,python,python27,rh-python27" \
14-
# Labels consumed by Red Hat build service.
15-
BZComponent="python27-docker" \
10+
# Labels consumed by Red Hat build service.
11+
LABEL BZComponent="python27-docker" \
1612
Name="rhscl/python-27-rhel7" \
1713
Version="2.7" \
1814
Release="1" \
19-
Architecture="x86_64"
15+
Architecture="x86_64" \
16+
io.k8s.description="Platform for building and running Python 2.7 applications" \
17+
io.k8s.display-name="Python 2.7" \
18+
io.openshift.expose-services="8080:http" \
19+
io.openshift.tags="builder,python,python27,rh-python27"
2020

2121
RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \
2222
yum-config-manager --enable rhel-7-server-optional-rpms && \

‎3.3/Dockerfile.rhel7‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ EXPOSE 8080
77
ENV PYTHON_VERSION=3.3 \
88
PATH=$HOME/.local/bin/:$PATH
99

10-
LABEL io.k8s.description="Platform for building and running Python 3.3 applications" \
11-
io.k8s.display-name="Python 3.3" \
12-
io.openshift.expose-services="8080:http" \
13-
io.openshift.tags="builder,python,python33" \
14-
# Labels consumed by Red Hat build service.
15-
BZComponent="openshift-sti-python-docker" \
10+
# Labels consumed by Red Hat build service.
11+
LABEL BZComponent="openshift-sti-python-docker" \
1612
Name="openshift3/python-33-rhel7" \
1713
Version="3.3" \
1814
Release="1" \
19-
Architecture="x86_64"
15+
Architecture="x86_64" \
16+
io.k8s.description="Platform for building and running Python 3.3 applications" \
17+
io.k8s.display-name="Python 3.3" \
18+
io.openshift.expose-services="8080:http" \
19+
io.openshift.tags="builder,python,python33"
2020

2121
RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \
2222
yum-config-manager --enable rhel-7-server-optional-rpms && \

‎3.4/Dockerfile.rhel7‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ EXPOSE 8080
77
ENV PYTHON_VERSION=3.4 \
88
PATH=$HOME/.local/bin/:$PATH
99

10-
LABEL io.k8s.description="Platform for building and running Python 3.4 applications" \
11-
io.k8s.display-name="Python 3.4" \
12-
io.openshift.expose-services="8080:http" \
13-
io.openshift.tags="builder,python,python34,rh-python34" \
14-
# Labels consumed by Red Hat build service.
15-
BZComponent="rh-python34-docker" \
10+
# Labels consumed by Red Hat build service.
11+
LABEL BZComponent="rh-python34-docker" \
1612
Name="rhscl/python-34-rhel7" \
1713
Version="3.4" \
1814
Release="1" \
19-
Architecture="x86_64"
15+
Architecture="x86_64" \
16+
io.k8s.description="Platform for building and running Python 3.4 applications" \
17+
io.k8s.display-name="Python 3.4" \
18+
io.openshift.expose-services="8080:http" \
19+
io.openshift.tags="builder,python,python34,rh-python34"
2020

2121
RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \
2222
yum-config-manager --enable rhel-7-server-optional-rpms && \

‎3.5/Dockerfile.rhel7‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ EXPOSE 8080
77
ENV PYTHON_VERSION=3.5 \
88
PATH=$HOME/.local/bin/:$PATH
99

10-
LABEL io.k8s.description="Platform for building and running Python 3.5 applications" \
11-
io.k8s.display-name="Python 3.5" \
12-
io.openshift.expose-services="8080:http" \
13-
io.openshift.tags="builder,python,python35,rh-python35" \
14-
# Labels consumed by Red Hat build service.
15-
BZComponent="rh-python35-docker" \
10+
# Labels consumed by Red Hat build service.
11+
LABEL BZComponent="rh-python35-docker" \
1612
Name="rhscl/python-35-rhel7" \
1713
Version="3.5" \
1814
Release="1" \
19-
Architecture="x86_64"
15+
Architecture="x86_64" \
16+
io.k8s.description="Platform for building and running Python 3.5 applications" \
17+
io.k8s.display-name="Python 3.5" \
18+
io.openshift.expose-services="8080:http" \
19+
io.openshift.tags="builder,python,python35,rh-python35"
2020

2121
RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \
2222
yum-config-manager --enable rhel-7-server-optional-rpms && \

0 commit comments

Comments
 (0)