Merge remote-tracking branch 'upstream/master' into upstream-merge

deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl

@@ -11,7 +11,7 @@ RUN zypper ref
 
 RUN zypper -n ref && \
     zypper -n up && \
-    zypper in -y which tar git gcc curl wget gzip xz unzip && \
+    zypper in -y which tar git gcc curl wget gzip xz unzip make && \
     zypper clean -a && \
     rm -f /var/log/zypper.log /var/log/zypp/history
 
@@ -24,14 +24,6 @@ RUN wget https://storage.googleapis.com/golang/go1.13.4.linux-amd64.tar.gz && \
 ENV PATH $PATH:/usr/local/go/bin:/home/stratos/go/bin
 ENV GOPATH /home/stratos/go
 
-# Install both glide and dep for now, so that this base image can use either
-
-# Install glide for backend go dependency management (legacy)
-RUN curl https://glide.sh/get | sh
-
-# Install dep for backend go dependency management
-RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-
 {{#IS_SLE}}
 RUN zypper rr base_ga
 RUN zypper rr base_update

deploy/stratos-base-images/Dockerfile.stratos-ruby-base.tmpl

@@ -0,0 +1,27 @@
+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_update
+RUN zypper ref
+{{/IS_SLE}}
+
+RUN zypper -n ref && \
+    zypper -n up && \
+    zypper in -y which tar curl wget gzip jq && \
+    zypper in -y ruby && \
+    zypper clean -a && \
+    rm -f /var/log/zypper.log /var/log/zypp/history
+
+WORKDIR /
+USER root
+
+{{#IS_SLE}}
+RUN zypper rr base_ga
+RUN zypper rr base_update
+RUN zypper rr sp_ga
+RUN zypper rr sp_update
+{{/IS_SLE}}

deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl

@@ -11,16 +11,17 @@ RUN zypper ref
 
 RUN zypper -n ref && \
     zypper -n up && \
-    zypper in -y which tar curl wget gzip && \
+    zypper in -y which tar curl wget gzip jq && \
+    zypper in -y ruby && \
+    zypper in -y make gcc-c++ && \
+    zypper in -y libopenssl-devel readline-devel && \
+    zypper in -y ruby-devel && \
     zypper clean -a && \
     rm -f /var/log/zypper.log /var/log/zypp/history
 
 WORKDIR /
 USER root
 
-ADD install-ruby.sh /install-ruby.sh
-RUN /install-ruby.sh
-
 {{#IS_SLE}}
 RUN zypper rr base_ga
 RUN zypper rr base_update

deploy/stratos-base-images/build-base-images.sh

@@ -151,6 +151,9 @@ tag_and_push_image() {
 build_and_push_image stratos-base Dockerfile.stratos-base
 
 # Base with ruby
+build_and_push_image stratos-ruby-base Dockerfile.stratos-ruby-base
+
+# Build base with ruby
 build_and_push_image stratos-ruby-build-base Dockerfile.stratos-ruby-build-base
 
 # Base with go