From d41db8516331491d7c7111dd7e72a00034721f86 Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Tue, 18 Feb 2020 15:04:57 +0000 Subject: [PATCH 1/2] Update SLE image builds for 15 SP1 --- .../Dockerfile.stratos-bk-base.tmpl | 20 +++++++-------- .../Dockerfile.stratos-bk-init-base.tmpl | 25 +++++++++++++++++++ .../Dockerfile.stratos-go-build-base.tmpl | 16 ++++++------ .../Dockerfile.stratos-mariadb-base.tmpl | 16 ++++++------ .../Dockerfile.stratos-nginx-base.tmpl | 18 ++++++------- .../Dockerfile.stratos-ruby-build-base.tmpl | 16 ++++++------ .../Dockerfile.stratos-ui-build-base.tmpl | 16 ++++++------ .../stratos-base-images/build-base-images.sh | 8 +++--- 8 files changed, 79 insertions(+), 56 deletions(-) create mode 100644 deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl index 8416e9ea83..e09e566113 100644 --- a/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl +++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl @@ -2,10 +2,10 @@ FROM {{BASE_IMAGE}} {{#IS_SLE}} RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp -RUN zypper addrepo -G -c '{{SMT_INTERNAL}}' smt_internal -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server +RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga +RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update +RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga +RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update RUN zypper ref {{/IS_SLE}} RUN zypper in -y ca-certificates && \ @@ -15,12 +15,11 @@ RUN zypper in -y ca-certificates && \ mkdir -p /root/.npm-global # Install latest git from devel/tools/scm repository {{^IS_SLE}} -RUN zypper ar http://download.opensuse.org/repositories/devel:/tools:/scm/openSUSE_Leap_15.1/devel:tools:scm.repo && \ +RUN zypper ar -p 50 http://download.opensuse.org/repositories/devel:/tools:/scm/openSUSE_Leap_15.1/devel:tools:scm.repo && \ zypper --no-gpg-checks in -y git && \ zypper rr devel_tools_scm && \ zypper clean -a && \ rm -f /var/log/zypper.log /var/log/zypp/history - {{/IS_SLE}} {{#IS_SLE}} RUN zypper ar http://download.opensuse.org/repositories/devel:/tools:/scm/SLE_15/devel:tools:scm.repo && \ @@ -28,13 +27,12 @@ RUN zypper ar http://download.opensuse.org/repositories/devel:/tools:/scm/SLE_15 zypper rr devel_tools_scm && \ zypper clean -a && \ rm -f /var/log/zypper.log /var/log/zypp/history - {{/IS_SLE}} {{#IS_SLE}} -RUN zypper rr smt_internal -RUN zypper rr smt_internal_update -RUN zypper rr smt_internal_sdk -RUN zypper rr smt_internal_server +RUN zypper rr base_ga +RUN zypper rr base_update +RUN zypper rr sp_ga +RUN zypper rr sp_update {{/IS_SLE}} WORKDIR /srv diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl new file mode 100644 index 0000000000..a6c7fedeb7 --- /dev/null +++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl @@ -0,0 +1,25 @@ +FROM {{BASE_IMAGE}} + +{{#IS_SLE}} +RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp +RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga +RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update +RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga +RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_updateRUN zypper ref +{{/IS_SLE}} +RUN zypper in -y ca-certificates && \ + zypper in -y curl && \ + zypper in -y openssh && \ + zypper in -y jq && \ + zypper in -y bind-utils && \ + zypper in -y hostname && \ + mkdir -p /srv && \ + mkdir -p /root/.npm-global + +{{#IS_SLE}} +RUN zypper rr base_ga +RUN zypper rr base_update +RUN zypper rr sp_ga +RUN zypper rr sp_update +{{/IS_SLE}} +WORKDIR /srv diff --git a/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl index 871c53c857..a510907974 100644 --- a/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl +++ b/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl @@ -2,10 +2,10 @@ FROM {{BASE_IMAGE}} {{#IS_SLE}} RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp -RUN zypper addrepo -G -c '{{SMT_INTERNAL}}' smt_internal -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server +RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga +RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update +RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga +RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update RUN zypper ref {{/IS_SLE}} @@ -33,10 +33,10 @@ RUN curl https://glide.sh/get | sh RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh {{#IS_SLE}} -RUN zypper rr smt_internal -RUN zypper rr smt_internal_update -RUN zypper rr smt_internal_sdk -RUN zypper rr smt_internal_server +RUN zypper rr base_ga +RUN zypper rr base_update +RUN zypper rr sp_ga +RUN zypper rr sp_update {{/IS_SLE}} WORKDIR /home/stratos/go diff --git a/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl index 7c4cce74ff..b5931c3e7a 100644 --- a/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl +++ b/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl @@ -2,10 +2,10 @@ FROM {{BASE_IMAGE}} {{#IS_SLE}} RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp -RUN zypper addrepo -G -c '{{SMT_INTERNAL}}' smt_internal -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server +RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga +RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update +RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga +RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update RUN zypper ref {{/IS_SLE}} @@ -29,10 +29,10 @@ RUN rm -rf /var/lib/mysql \ && chown -R mysql:mysql /var/log/mysql {{#IS_SLE}} -RUN zypper rr smt_internal -RUN zypper rr smt_internal_update -RUN zypper rr smt_internal_sdk -RUN zypper rr smt_internal_server +RUN zypper rr base_ga +RUN zypper rr base_update +RUN zypper rr sp_ga +RUN zypper rr sp_update {{/IS_SLE}} VOLUME ["/var/lib/mysql"] \ No newline at end of file diff --git a/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl index d42d542d5b..af69700a28 100644 --- a/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl +++ b/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl @@ -1,11 +1,11 @@ FROM {{BASE_IMAGE}} {{#IS_SLE}} RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp -RUN zypper addrepo -G -t yum -c 'http://nginx.org/packages/sles/15' nginx -RUN zypper addrepo -G -c '{{SMT_INTERNAL}}' smt_internal -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server +RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga +RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update +RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga +RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update +RUN zypper addrepo -G -c -p 50 'http://nginx.org/packages/sles/15' nginx {{/IS_SLE}} RUN zypper -n ref && \ @@ -16,8 +16,8 @@ RUN zypper -n ref && \ {{#IS_SLE}} RUN zypper rr nginx -RUN zypper rr smt_internal -RUN zypper rr smt_internal_update -RUN zypper rr smt_internal_sdk -RUN zypper rr smt_internal_server +RUN zypper rr base_ga +RUN zypper rr base_update +RUN zypper rr sp_ga +RUN zypper rr sp_update {{/IS_SLE}} \ No newline at end of file diff --git a/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl index fd1728474c..b278e64b73 100644 --- a/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl +++ b/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl @@ -2,10 +2,10 @@ FROM {{BASE_IMAGE}} {{#IS_SLE}} RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp -RUN zypper addrepo -G -c '{{SMT_INTERNAL}}' smt_internal -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server +RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga +RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update +RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga +RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update RUN zypper ref {{/IS_SLE}} @@ -22,8 +22,8 @@ ADD install-ruby.sh /install-ruby.sh RUN /install-ruby.sh {{#IS_SLE}} -RUN zypper rr smt_internal -RUN zypper rr smt_internal_update -RUN zypper rr smt_internal_sdk -RUN zypper rr smt_internal_server +RUN zypper rr base_ga +RUN zypper rr base_update +RUN zypper rr sp_ga +RUN zypper rr sp_update {{/IS_SLE}} diff --git a/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl index 55cdaf6c5b..08861d7917 100644 --- a/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl +++ b/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl @@ -2,10 +2,10 @@ FROM {{BASE_IMAGE}} {{#IS_SLE}} RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp -RUN zypper addrepo -G -c '{{SMT_INTERNAL}}' smt_internal -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk -RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server +RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga +RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update +RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga +RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update RUN zypper ref {{/IS_SLE}} @@ -28,10 +28,10 @@ RUN useradd -ms /bin/bash stratos && \ chgrp users /usr/dist {{#IS_SLE}} -RUN zypper rr smt_internal -RUN zypper rr smt_internal_update -RUN zypper rr smt_internal_sdk -RUN zypper rr smt_internal_server +RUN zypper rr base_ga +RUN zypper rr base_update +RUN zypper rr sp_ga +RUN zypper rr sp_update {{/IS_SLE}} USER stratos diff --git a/deploy/stratos-base-images/build-base-images.sh b/deploy/stratos-base-images/build-base-images.sh index 2e58c97a4c..6945ce30fc 100755 --- a/deploy/stratos-base-images/build-base-images.sh +++ b/deploy/stratos-base-images/build-base-images.sh @@ -81,10 +81,10 @@ fi if [ -n "${IS_SLE}" ]; then # Check env vars - : "${SMT_INTERNAL?Environment variable must be set when building SLE images}" - : "${SMT_INTERNAL_UPDATE?Environment variable must be set when building SLE images}" - : "${SMT_INTERNAL_SDK?Environment variable must be set when building SLE images}" - : "${SMT_INTERNAL_SERVER?Environment variable must be set when building SLE images}" + : "${ZYP_REPO_BASE_GA?Environment variable must be set when building SLE images}" + : "${ZYP_REPO_BASE_UPDATE?Environment variable must be set when building SLE images}" + : "${ZYP_REPO_SP_GA?Environment variable must be set when building SLE images}" + : "${ZYP_REPO_SP_UPDATE?Environment variable must be set when building SLE images}" fi set -x From 911b09beae74ef9ee8796e11214986135c9f2bb6 Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Tue, 18 Feb 2020 16:05:44 +0000 Subject: [PATCH 2/2] Fix typo --- .../stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl index a6c7fedeb7..16af5f9911 100644 --- a/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl +++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl @@ -5,7 +5,8 @@ RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga -RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_updateRUN zypper ref +RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update +RUN zypper ref {{/IS_SLE}} RUN zypper in -y ca-certificates && \ zypper in -y curl && \