Merge remote-tracking branch 'origin/master' into list-tidy-up

.gitignore

@@ -77,6 +77,9 @@ deploy/stratos-ui-release/dev_releases/
 output/fissile
 deploy/ci/travis/temp/
 
+# Helm Chart Image List
+deploy/kubernetes/console/imagelist.txt
+
 .dist/
 deploy/uaa/tmp/
 src/backend/*/vendor/

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## 2.6.1
+
+[Full Changelog](https://github.com/cloudfoundry/stratos/compare/2.6.0...2.6.1)
+
+This release contains a few fixes:
+
+**Fixes:**
+
+- Helm Chart does not work with Kubernetes 1.16 [\#4022](https://github.com/cloudfoundry/stratos/issues/4022)
+- Generated Ingress certificates during Kubernetes deployment are empty [\#4006](https://github.com/cloudfoundry/stratos/issues/4006)
+- Kubernetes Ingress certificate is incorrectly set [\#4005](https://github.com/cloudfoundry/stratos/issues/4005)
+- Update metric used for cells [\#4009](https://github.com/cloudfoundry/stratos/pull/4009)
+- Fix incorrect SSO behaviour following 2.4.0 --> 2.6.0 upgrade [\#4015](https://github.com/cloudfoundry/stratos/pull/4015)
+
 ## 2.6.0
 
 [Full Changelog](https://github.com/cloudfoundry/stratos/compare/2.5.0...2.6.0)

README.md

@@ -75,3 +75,4 @@ Tested with Browserstack
 ## License
 
 The work done has been licensed under Apache License 2.0. The license file can be found [here](LICENSE).
+

deploy/Dockerfile.all-in-one

@@ -1,5 +1,5 @@
 # Docker build for all-in-one Stratos
-FROM splatform/stratos-aio-base:opensuse as builder
+FROM splatform/stratos-aio-base:leap15_1 as builder
 
 # Ensure that we copy the custom-src folder
 COPY --chown=stratos:users . ./
@@ -17,7 +17,7 @@ RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh \
     && chmod +x jetstream
 
 # use --target=aio to build All-in-one image
-FROM splatform/stratos-bk-base:opensuse
+FROM splatform/stratos-bk-base:leap15_1
 ARG CANARY_BUILD
 COPY --from=builder /home/stratos/deploy/db /src/deploy/db
 COPY --from=builder /home/stratos/dev-certs /srv/dev-certs

deploy/Dockerfile.bk

@@ -1,4 +1,4 @@
-FROM splatform/stratos-bk-build-base:opensuse as builder
+FROM splatform/stratos-bk-build-base:leap15_1 as builder
 ARG stratos_version
 RUN mkdir -p /home/stratos
 WORKDIR /home/stratos
@@ -7,12 +7,12 @@ RUN go version
 RUN npm install
 RUN npm run build-backend
 
-FROM splatform/stratos-bk-base:opensuse as common-build
+FROM splatform/stratos-bk-base:leap15_1 as common-build
 COPY --from=builder /home/stratos/src/jetstream/jetstream /srv/
 RUN chmod +x /srv/jetstream
 
 # use --target=db-migrator to build db-migrator image
-FROM splatform/stratos-bk-base:opensuse as db-migrator
+FROM splatform/stratos-bk-base:leap15_1 as db-migrator
 WORKDIR /src
 COPY deploy/db/dbconf.yml db/dbconf.yml
 COPY deploy/db/scripts/development.sh .
@@ -23,15 +23,15 @@ RUN chmod +x development.sh
 CMD bash /src/wait-for-it.sh -t 90 mariadb:3306 && bash /src/development.sh
 
 # use --target=postflight-job to build prod postflight-job
-FROM splatform/stratos-bk-base:opensuse as postflight-job
+FROM splatform/stratos-bk-base:leap15_1 as postflight-job
 RUN zypper -n in mariadb-client
 COPY --from=common-build /srv/jetstream /usr/local/bin/jetstream
 COPY deploy/db/dbconf.yml db/dbconf.yml
 COPY deploy/db/scripts/run-postflight-job.k8s.sh /run-postflight-job.sh
 CMD ["/run-postflight-job.sh"]
 
 # use --target=prod-build to build a backend image for Kubernetes
-FROM splatform/stratos-bk-base:opensuse as prod-build
+FROM splatform/stratos-bk-base:leap15_1 as prod-build
 RUN zypper in -y curl
 COPY deploy/containers/proxy/entrypoint.sh /entrypoint.sh
 COPY /deploy/db/scripts/run-preflight-job.sh /run-preflight-job.sh

deploy/Dockerfile.ui

@@ -1,4 +1,4 @@
-FROM splatform/stratos-ui-build-base:opensuse as base-build
+FROM splatform/stratos-ui-build-base:leap15_1 as base-build
 ARG project
 ARG branch
 ARG commit
@@ -13,7 +13,7 @@ RUN npm install && \
     mkdir -p /usr/dist && \
     cp -R dist/* /usr/dist
 
-FROM splatform/stratos-nginx-base:opensuse as prod-build
+FROM splatform/stratos-nginx-base:leap15_1 as prod-build
 RUN mkdir -p /usr/share/doc/suse
 COPY  deploy/containers/nginx/LICENSE.txt /usr/share/doc/suse/LICENSE.txt
 COPY  deploy/containers/nginx/conf/nginx.k8s.conf /etc/nginx/nginx.conf
@@ -22,7 +22,7 @@ COPY deploy/containers/nginx/run-nginx.sh/ /run-nginx.sh
 EXPOSE 80 443
 CMD [ "/run-nginx.sh" ]
 
-FROM splatform/stratos-nginx-base:opensuse as dev-build
+FROM splatform/stratos-nginx-base:leap15_1 as dev-build
 RUN mkdir -p /etc/secrets/ && \
   openssl req -batch -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/secrets/server.key -out /etc/secrets/server.crt && \
   chmod 0600 /etc/secrets && \

deploy/ci/scripts/Dockerfile.stratos-ci

@@ -6,7 +6,7 @@
 # Default Image used to run tasks - contains Helm
 
 # Builder for the github release tool
-FROM splatform/stratos-go-build-base:opensuse as go-base
+FROM splatform/stratos-go-build-base:leap15_1 as go-base
 RUN export GOPATH=/home/stratos/go && \
     mkdir -p ${GOPATH} && \
     go get github.com/aktau/github-release

deploy/ci/tasks/dev-releases/github-helper.sh

@@ -39,7 +39,7 @@ downloadReleaseFile() {
   local parser=". | map(select(.tag_name == \"$VERSION\"))[0].assets | map(select(.name == \"$FILE\"))[0].id"
 
   # Get release information from GitHub
-  curl -H "Authorization: token $TOKEN" -H "Accept: application/vnd.github.v3.raw" -s $GITHUB/repos/$REPO/releases > releases.json
+  curl -L -H "Authorization: token $TOKEN" -H "Accept: application/vnd.github.v3.raw" -s $GITHUB/repos/$REPO/releases > releases.json
   if [ $? -ne 0 ]; then
     echo "Could not download release information for ${REPO}"
     exit 1

deploy/common-build.sh

@@ -43,7 +43,7 @@ function buildAndPublishImage {
 
 # Proxy support
 # Remove intermediate containers after a successful build
-BUILD_ARGS="--rm=true"
+BUILD_ARGS="--rm=true --squash"
 RUN_ARGS=""
 if [ -n "${http_proxy:-}" -o -n "${HTTP_PROXY:-}" ]; then
   BUILD_ARGS="${BUILD_ARGS} --build-arg http_proxy=${http_proxy:-${HTTP_PROXY}}"

deploy/containers/nginx/Dockerfile.dc

@@ -1,4 +1,4 @@
-FROM splatform/stratos-nginx-base:opensuse
+FROM splatform/stratos-nginx-base:leap15_1
 
 RUN mkdir -p /etc/secrets/ && \
   openssl req -batch -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/secrets/server.key -out /etc/secrets/server.crt && \

deploy/db/Dockerfile.mariadb

@@ -1,6 +1,13 @@
-FROM splatform/stratos-db-base:opensuse
+FROM splatform/stratos-db-base:leap15_1
+
+# See: https://github.com/docker-library/mariadb/blob/master/10.2/Dockerfile
+RUN \
+	find /etc/ -name 'my*.cnf' -print0 \
+		| xargs -0 grep -lZE '^(bind-address|log)' \
+		| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/'; 
 
 COPY mariadb-entrypoint.sh /docker-entrypoint.sh
+COPY mariadb-ping.sh /dbping.sh
 
 # ENTRYPOINT
 ENTRYPOINT ["/docker-entrypoint.sh"]