Skip to content

Commit

Permalink
Merge pull request #316 from SUSE/sle-base-images
Browse files Browse the repository at this point in the history 
Update SLE base images
  • Loading branch information
@nwmac
nwmac authored Feb 19, 2020
2 parents a2f910e + b7aee95 commit 67b39a9
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 64 deletions.
20 changes: 9 additions & 11 deletions deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -16,26 +16,24 @@ 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 && \
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 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
16 changes: 8 additions & 8 deletions deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -18,9 +18,9 @@ RUN zypper in -y ca-certificates && \
mkdir -p /root/.npm-global

{{#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
16 changes: 8 additions & 8 deletions deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand Down Expand Up @@ -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
16 changes: 8 additions & 8 deletions deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand All @@ -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"]
18 changes: 9 additions & 9 deletions deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl
View file
Original file line number Diff line number Diff line change
@@ -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 && \
Expand All @@ -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}}
16 changes: 8 additions & 8 deletions deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand All @@ -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}}
16 changes: 8 additions & 8 deletions deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions deploy/stratos-base-images/build-base-images.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 67b39a9

Please sign in to comment.