Skip to content

Commit 96852af

Browse files
committed
Update openqa containers to Leap16
As a side effect this should fix also the problem with the postgres incompatibility. Signed-off-by: Ioannis Bonatakis <[email protected]>
1 parent 7549bb9 commit 96852af

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

container/devel:openQA:ci/base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# in one go
55
# see https://progress.opensuse.org/issues/67855
66
#!NoSquash
7-
FROM opensuse/leap:15.6
7+
FROM opensuse/leap:16.0
88

99
# only dependencies for CircleCI to be able to load/save the package cache
1010
# and fix permissions for the unprivileged user we use

container/openqa_data/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM opensuse/leap:15.6
1+
FROM opensuse/leap:16.0
22
LABEL maintainer="Jan Sedlak <[email protected]>, Josef Skladanka <[email protected]>, wnereiz <[email protected]>, Sergio Lindo Mansilla <[email protected]>"
33
LABEL version="0.3"
44

container/webui/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: MIT
22
#!BuildTag: openqa_webui:latest opensuse/openqa-webui:latest opensuse/openqa-webui:%PKG_VERSION% opensuse/openqa-webui:%PKG_VERSION%.%RELEASE%
3-
FROM opensuse/leap:15.6
3+
FROM opensuse/leap:16.0
44

55
# labelprefix=org.opensuse.openqa-webui
66
LABEL org.opencontainers.image.title="openQA webui container"
@@ -14,13 +14,13 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
1414
ENV LC_ALL=C.UTF-8
1515

1616
# hadolint ignore=DL3037
17-
RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/15.6 devel_openQA && \
18-
zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:15.6/15.6 devel_openQA_Leap && \
17+
RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/16.0 devel_openQA && \
18+
zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:16.0/16.0 devel_openQA_Leap && \
1919
zypper --gpg-auto-import-keys ref && \
2020
# openQA might need rubygem:sass to compile assets in this context due to
2121
# unknown reasons even though the package should use the precompiled
2222
# assets from cache.tar
23-
zypper in -y ca-certificates-mozilla curl openQA-local-db apache2 apache2-utils hostname which w3m 'rubygem(sass)>=3.7.4' && \
23+
zypper in -y ca-certificates-mozilla curl openQA-local-db apache2 apache2-utils hostname which w3m perl-CSS-Sass && \
2424
zypper clean && \
2525
gensslcert && \
2626
/usr/share/openqa/script/configure-web-proxy && \

container/webui/Dockerfile-lb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: MIT
22
#!BuildTag: openqa_webui_lb:latest opensuse/openqa-webui-lb:latest opensuse/openqa-webui-lb:%PKG_VERSION% opensuse/openqa-webui-lb:%PKG_VERSION%.%RELEASE%
3-
FROM opensuse/leap:15.6
3+
FROM opensuse/leap:16.0
44

55
# labelprefix=org.opensuse.openqa-webui-lb
66
LABEL org.opencontainers.image.title="openQA load-balancer webui container"
@@ -12,8 +12,8 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
1212
# endlabelprefix
1313

1414
# hadolint ignore=DL3037
15-
RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/15.6 devel_openQA && \
16-
zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:15.6/15.6 devel_openQA_Leap && \
15+
RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/16.0 devel_openQA && \
16+
zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:16.0/16.0 devel_openQA_Leap && \
1717
zypper --gpg-auto-import-keys ref && \
1818
zypper in -y openQA nginx && \
1919
zypper clean

container/worker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: MIT
22
#!BuildTag: openqa_worker:latest opensuse/openqa-worker:latest opensuse/openqa-worker:%PKG_VERSION% opensuse/openqa-worker:%PKG_VERSION%.%RELEASE%
3-
FROM opensuse/leap:15.6
3+
FROM opensuse/leap:16.0
44

55
# labelprefix=org.opensuse.openqa-worker
66
LABEL org.opencontainers.image.title="openQA worker container"
@@ -12,8 +12,8 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
1212
# endlabelprefix
1313

1414
# hadolint ignore=DL3037
15-
RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/15.6 devel_openQA && \
16-
zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:15.6/15.6 devel_openQA_Leap && \
15+
RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/16.0 devel_openQA && \
16+
zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:16.0/16.0 devel_openQA_Leap && \
1717
zypper --gpg-auto-import-keys ref && \
1818
zypper in -yl ca-certificates-mozilla curl gzip rsync xz && \
1919
zypper in -yl openQA-worker os-autoinst-s390-deps os-autoinst-ipmi-deps && \

0 commit comments

Comments
 (0)