Merge remote-tracking branch 'origin/master' into develop

uselagoon · Feb 17, 2020 · 5e2e4d2 · 5e2e4d2
2 parents dfdf3f5 + 60eb80e
commit 5e2e4d2
Show file tree

Hide file tree

Showing 306 changed files with 18,386 additions and 3,909 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,10 @@ node {
   env.MINISHIFT_HOME = "/data/jenkins/.minishift"
 
   withEnv(['AWS_BUCKET=jobs.amazeeio.services', 'AWS_DEFAULT_REGION=us-east-2']) {
-    withCredentials([usernamePassword(credentialsId: 'aws-s3-lagoon', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY')]) {
+    withCredentials([
+      usernamePassword(credentialsId: 'aws-s3-lagoon', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
+      string(credentialsId: 'SKIP_IMAGE_PUBLISH', variable: 'SKIP_IMAGE_PUBLISH')
+    ]) {
       try {
         env.CI_BUILD_TAG = env.BUILD_TAG.replaceAll('%2f','').replaceAll("[^A-Za-z0-9]+", "").toLowerCase()
         env.SAFEBRANCH_NAME = env.BRANCH_NAME.replaceAll('%2f','-').replaceAll("[^A-Za-z0-9]+", "-").toLowerCase()
@@ -28,7 +31,6 @@ node {
         stage ('Checkout') {
           def checkout = checkout scm
           env.GIT_COMMIT = checkout["GIT_COMMIT"]
-          sh "git fetch --tags"
         }
 
         stage ('build images') {
@@ -59,8 +61,12 @@ node {
               'push images to amazeeiolagoon': {
                 stage ('push images to amazeeiolagoon/*') {
                   withCredentials([string(credentialsId: 'amazeeiojenkins-dockerhub-password', variable: 'PASSWORD')]) {
-                    sh 'docker login -u amazeeiojenkins -p $PASSWORD'
-                    sh "make -O${SYNC_MAKE_OUTPUT} -j4 publish-amazeeiolagoon-baseimages publish-amazeeiolagoon-serviceimages BRANCH_NAME=${SAFEBRANCH_NAME}"
+                    if (env.SKIP_IMAGE_PUBLISH != 'true') {
+                      sh 'docker login -u amazeeiojenkins -p $PASSWORD'
+                      sh "make -O${SYNC_MAKE_OUTPUT} -j4 publish-amazeeiolagoon-baseimages publish-amazeeiolagoon-serviceimages BRANCH_NAME=${SAFEBRANCH_NAME}"
+                    } else {
+                      sh 'echo "skipped because of SKIP_IMAGE_PUBLISH env variable"'
+                    }
                   }
                 }
               }
@@ -94,7 +100,7 @@ node {
           )
         }
 
-        if (env.TAG_NAME) {
+        if (env.TAG_NAME && env.SKIP_IMAGE_PUBLISH != 'true') {
           stage ('publish-amazeeio') {
             withCredentials([string(credentialsId: 'amazeeiojenkins-dockerhub-password', variable: 'PASSWORD')]) {
               sh 'docker login -u amazeeiojenkins -p $PASSWORD'
@@ -103,7 +109,7 @@ node {
           }
         }
 
-        if (env.BRANCH_NAME == 'master') {
+        if (env.BRANCH_NAME == 'master' && env.SKIP_IMAGE_PUBLISH != 'true') {
           stage ('save-images-s3') {
             sh "make -O${SYNC_MAKE_OUTPUT} -j8 s3-save"
           }

diff --git a/Makefile b/Makefile
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -6,7 +6,7 @@ services:
       - ./services/api-db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       - ./services/api-db/rerun_initdb.sh:/rerun_initdb.sh
     ports:
-      - '3306:3306'
+      - '3366:3306'
     labels:
       lagoon.type: mariadb-single
       lagoon.image: amazeeiolagoon/api-db:develop
@@ -323,6 +323,18 @@ services:
       - ./local-dev/api-data-watcher-pusher:/home
     labels:
       lagoon.type: none
+  local-dbaas-provider:
+    image: ${IMAGE_REPO:-lagoon}/local-dbaas-provider
+    restart: always
+    labels:
+      lagoon.type: none
+    environment:
+      MYSQL_DATABASE: 'db'
+      MYSQL_USER: 'user'
+      MYSQL_PASSWORD: 'password'
+      MYSQL_ROOT_PASSWORD: 'password'
+    ports:
+      - '3306:3306'
   local-minio:
     image: minio/minio
     entrypoint: sh
@@ -408,6 +420,8 @@ services:
     volumes:
       - './services/auto-idler/idle-services.sh:/idle-services.sh'
       - './services/auto-idler/idle-clis.sh:/idle-clis.sh'
+      - './services/auto-idler/openshift-services.sh:/openshift-services.sh'
+      - './services/auto-idler/openshift-clis.sh:/openshift-clis.sh'
       - './services/auto-idler/create_jwt.sh:/create_jwt.sh'
     labels:
       lagoon.type: custom

diff --git a/docs/_static/theme_overrides.css b/docs/_static/theme_overrides.css
@@ -0,0 +1,17 @@
+/* override table width restrictions */
+@media screen and (min-width: 767px) {
+
+    .docutils table td {
+       /* !important prevents the common CSS stylesheets from overriding
+          this as on RTD they are loaded after this stylesheet */
+       white-space: nowrap !important;
+    }
+
+    .docutils {
+       overflow: visible !important;
+    }
+ }
+
+ .wy-nav-content-wrap {
+    overflow: scroll;
+ }