From 7da57a9872b0409160c132d9c2a3d9c9feb7ad15 Mon Sep 17 00:00:00 2001 From: Michael Schmid Date: Wed, 27 Jan 2021 16:15:08 -0500 Subject: [PATCH] v1.13.5 --- docker-compose.yaml | 94 +++++++++++++++---------------- lagoon-remote/docker-compose.yaml | 22 ++++---- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 912ffc8701..c98aed9ef4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,7 +10,7 @@ services: labels: lagoon.type: custom lagoon.template: services/api-db/.lagoon.app.yml - lagoon.image: amazeeiolagoon/api-db:v1-13-4 + lagoon.image: amazeeiolagoon/api-db:v1-13-5 webhook-handler: image: ${IMAGE_REPO:-lagoon}/webhook-handler command: yarn run dev @@ -22,7 +22,7 @@ services: labels: lagoon.type: custom lagoon.template: services/webhook-handler/.lagoon.app.yml - lagoon.image: amazeeiolagoon/webhook-handler:v1-13-4 + lagoon.image: amazeeiolagoon/webhook-handler:v1-13-5 backup-handler: image: ${IMAGE_REPO:-lagoon}/backup-handler restart: on-failure @@ -31,7 +31,7 @@ services: labels: lagoon.type: custom lagoon.template: services/backup-handler/.lagoon.app.yml - lagoon.image: amazeeiolagoon/backup-handler:v1-13-4 + lagoon.image: amazeeiolagoon/backup-handler:v1-13-5 depends_on: - broker broker: @@ -42,7 +42,7 @@ services: labels: lagoon.type: rabbitmq-cluster lagoon.template: services/broker/.lagoon.app.yml - lagoon.image: amazeeiolagoon/broker:v1-13-4 + lagoon.image: amazeeiolagoon/broker:v1-13-5 openshiftremove: image: ${IMAGE_REPO:-lagoon}/openshiftremove command: yarn run dev @@ -52,7 +52,7 @@ services: labels: lagoon.type: custom lagoon.template: services/openshiftremove/.lagoon.app.yml - lagoon.image: amazeeiolagoon/openshiftremove:v1-13-4 + lagoon.image: amazeeiolagoon/openshiftremove:v1-13-5 openshiftbuilddeploy: image: ${IMAGE_REPO:-lagoon}/openshiftbuilddeploy command: yarn run dev @@ -64,7 +64,7 @@ services: labels: lagoon.type: custom lagoon.template: services/openshiftbuilddeploy/.lagoon.app.yml - lagoon.image: amazeeiolagoon/openshiftbuilddeploy:v1-13-4 + lagoon.image: amazeeiolagoon/openshiftbuilddeploy:v1-13-5 openshiftbuilddeploymonitor: image: ${IMAGE_REPO:-lagoon}/openshiftbuilddeploymonitor command: yarn run dev @@ -78,7 +78,7 @@ services: labels: lagoon.type: custom lagoon.template: services/openshiftbuilddeploymonitor/.lagoon.app.yml - lagoon.image: amazeeiolagoon/openshiftbuilddeploymonitor:v1-13-4 + lagoon.image: amazeeiolagoon/openshiftbuilddeploymonitor:v1-13-5 openshiftjobs: image: ${IMAGE_REPO:-lagoon}/openshiftjobs command: yarn run dev @@ -92,7 +92,7 @@ services: labels: lagoon.type: custom lagoon.template: services/openshiftjobs/.lagoon.app.yml - lagoon.image: amazeeiolagoon/openshiftjobs:v1-13-4 + lagoon.image: amazeeiolagoon/openshiftjobs:v1-13-5 openshiftjobsmonitor: image: ${IMAGE_REPO:-lagoon}/openshiftjobsmonitor command: yarn run dev @@ -102,7 +102,7 @@ services: labels: lagoon.type: custom lagoon.template: services/openshiftjobsmonitor/.lagoon.app.yml - lagoon.image: amazeeiolagoon/openshiftjobsmonitor:v1-13-4 + lagoon.image: amazeeiolagoon/openshiftjobsmonitor:v1-13-5 openshiftmisc: image: ${IMAGE_REPO:-lagoon}/openshiftmisc command: yarn run dev @@ -112,7 +112,7 @@ services: labels: lagoon.type: custom lagoon.template: services/openshiftmisc/.lagoon.app.yml - lagoon.image: amazeeiolagoon/openshiftmisc:v1-13-4 + lagoon.image: amazeeiolagoon/openshiftmisc:v1-13-5 kubernetesmisc: image: ${IMAGE_REPO:-lagoon}/kubernetesmisc command: yarn run dev @@ -122,7 +122,7 @@ services: labels: lagoon.type: custom lagoon.template: services/kubernetesmisc/.lagoon.app.yml - lagoon.image: amazeeiolagoon/kubernetesmisc:v1-13-4 + lagoon.image: amazeeiolagoon/kubernetesmisc:v1-13-5 kubernetesbuilddeploy: image: ${IMAGE_REPO:-lagoon}/kubernetesbuilddeploy command: yarn run dev @@ -135,7 +135,7 @@ services: labels: lagoon.type: custom lagoon.template: services/kubernetesbuilddeploy/.lagoon.app.yml - lagoon.image: amazeeiolagoon/kubernetesbuilddeploy:v1-13-4 + lagoon.image: amazeeiolagoon/kubernetesbuilddeploy:v1-13-5 kubernetesdeployqueue: image: ${IMAGE_REPO:-lagoon}/kubernetesdeployqueue command: yarn run dev @@ -145,7 +145,7 @@ services: labels: lagoon.type: custom lagoon.template: services/kubernetesdeployqueue/.lagoon.app.yml - lagoon.image: amazeeiolagoon/kubernetesdeployqueue:v1-13-4 + lagoon.image: amazeeiolagoon/kubernetesdeployqueue:v1-13-5 kubernetesbuilddeploymonitor: image: ${IMAGE_REPO:-lagoon}/kubernetesbuilddeploymonitor command: yarn run dev @@ -159,7 +159,7 @@ services: labels: lagoon.type: custom lagoon.template: services/kubernetesbuilddeploymonitor/.lagoon.app.yml - lagoon.image: amazeeiolagoon/kubernetesbuilddeploymonitor:v1-13-4 + lagoon.image: amazeeiolagoon/kubernetesbuilddeploymonitor:v1-13-5 kubernetesjobs: image: ${IMAGE_REPO:-lagoon}/kubernetesjobs command: yarn run dev @@ -173,7 +173,7 @@ services: labels: lagoon.type: custom lagoon.template: services/kubernetesjobs/.lagoon.app.yml - lagoon.image: amazeeiolagoon/kubernetesjobs:v1-13-4 + lagoon.image: amazeeiolagoon/kubernetesjobs:v1-13-5 kubernetesjobsmonitor: image: ${IMAGE_REPO:-lagoon}/kubernetesjobsmonitor command: yarn run dev @@ -187,7 +187,7 @@ services: labels: lagoon.type: custom lagoon.template: services/kubernetesjobsmonitor/.lagoon.app.yml - lagoon.image: amazeeiolagoon/kubernetesjobsmonitor:v1-13-4 + lagoon.image: amazeeiolagoon/kubernetesjobsmonitor:v1-13-5 kubernetesremove: image: ${IMAGE_REPO:-lagoon}/kubernetesremove command: yarn run dev @@ -197,7 +197,7 @@ services: labels: lagoon.type: custom lagoon.template: services/kubernetesremove/.lagoon.app.yml - lagoon.image: amazeeiolagoon/kubernetesremove:v1-13-4 + lagoon.image: amazeeiolagoon/kubernetesremove:v1-13-5 controllerhandler: image: ${IMAGE_REPO:-lagoon}/controllerhandler command: yarn run dev @@ -207,7 +207,7 @@ services: labels: lagoon.type: custom lagoon.template: services/controllerhandler/.lagoon.app.yml - lagoon.image: amazeeiolagoon/controllerhandler:v1-13-4 + lagoon.image: amazeeiolagoon/controllerhandler:v1-13-5 logs2rocketchat: image: ${IMAGE_REPO:-lagoon}/logs2rocketchat command: yarn run dev @@ -217,7 +217,7 @@ services: labels: lagoon.type: custom lagoon.template: services/logs2rocketchat/.lagoon.app.yml - lagoon.image: amazeeiolagoon/logs2rocketchat:v1-13-4 + lagoon.image: amazeeiolagoon/logs2rocketchat:v1-13-5 logs2slack: image: ${IMAGE_REPO:-lagoon}/logs2slack command: yarn run dev @@ -227,7 +227,7 @@ services: labels: lagoon.type: custom lagoon.template: services/logs2slack/.lagoon.app.yml - lagoon.image: amazeeiolagoon/logs2slack:v1-13-4 + lagoon.image: amazeeiolagoon/logs2slack:v1-13-5 logs2microsoftteams: image: ${IMAGE_REPO:-lagoon}/logs2microsoftteams command: yarn run dev @@ -237,7 +237,7 @@ services: labels: lagoon.type: custom lagoon.template: services/logs2microsoftteams/.lagoon.app.yml - lagoon.image: amazeeiolagoon/logs2microsoftteams:v1-13-4 + lagoon.image: amazeeiolagoon/logs2microsoftteams:v1-13-5 logs2email: image: ${IMAGE_REPO:-lagoon}/logs2email command: yarn run dev @@ -247,7 +247,7 @@ services: labels: lagoon.type: custom lagoon.template: services/logs2slack/.lagoon.app.yml - lagoon.image: amazeeiolagoon/logs2email:v1-13-4 + lagoon.image: amazeeiolagoon/logs2email:v1-13-5 depends_on: - mailhog mailhog: @@ -268,7 +268,7 @@ services: labels: lagoon.type: custom lagoon.template: services/webhooks2tasks/.lagoon.app.yml - lagoon.image: amazeeiolagoon/webhooks2tasks:v1-13-4 + lagoon.image: amazeeiolagoon/webhooks2tasks:v1-13-5 api: image: ${IMAGE_REPO:-lagoon}/api command: yarn run dev @@ -291,7 +291,7 @@ services: labels: lagoon.type: custom lagoon.template: services/api/.lagoon.app.yml - lagoon.image: amazeeiolagoon/api:v1-13-4 + lagoon.image: amazeeiolagoon/api:v1-13-5 ui: image: ${IMAGE_REPO:-lagoon}/ui command: yarn run dev @@ -305,7 +305,7 @@ services: labels: lagoon.type: custom lagoon.template: services/ui/.lagoon.app.yml - lagoon.image: amazeeiolagoon/ui:v1-13-4 + lagoon.image: amazeeiolagoon/ui:v1-13-5 ssh: image: ${IMAGE_REPO:-lagoon}/ssh depends_on: @@ -326,7 +326,7 @@ services: labels: lagoon.type: custom lagoon.template: services/ssh/.lagoon.app.yml - lagoon.image: amazeeiolagoon/ssh:v1-13-4 + lagoon.image: amazeeiolagoon/ssh:v1-13-5 auth-server: image: ${IMAGE_REPO:-lagoon}/auth-server command: yarn run dev @@ -340,7 +340,7 @@ services: labels: lagoon.type: custom lagoon.template: services/auth-server/.lagoon.app.yml - lagoon.image: amazeeiolagoon/auth-server:v1-13-4 + lagoon.image: amazeeiolagoon/auth-server:v1-13-5 keycloak: image: ${IMAGE_REPO:-lagoon}/keycloak user: '111111111' @@ -351,7 +351,7 @@ services: labels: lagoon.type: custom lagoon.template: services/keycloak/.lagoon.app.yml - lagoon.image: amazeeiolagoon/keycloak:v1-13-4 + lagoon.image: amazeeiolagoon/keycloak:v1-13-5 keycloak-db: image: ${IMAGE_REPO:-lagoon}/keycloak-db ports: @@ -359,7 +359,7 @@ services: labels: lagoon.type: custom lagoon.template: services/keycloak-db/.lagoon.app.yml - lagoon.image: amazeeiolagoon/keycloak-db:v1-13-4 + lagoon.image: amazeeiolagoon/keycloak-db:v1-13-5 tests-kubernetes: image: ${IMAGE_REPO:-lagoon}/tests environment: @@ -543,7 +543,7 @@ services: labels: lagoon.type: custom lagoon.template: services/drush-alias/.lagoon.app.yml - lagoon.image: amazeeiolagoon/drush-alias:v1-13-4 + lagoon.image: amazeeiolagoon/drush-alias:v1-13-5 version: '2' logs-db: image: ${IMAGE_REPO:-lagoon}/logs-db @@ -559,14 +559,14 @@ services: labels: lagoon.type: elasticsearch lagoon.template: services/logs-db/.lagoon.single.yml - lagoon.image: amazeeiolagoon/logs-db:v1-13-4 + lagoon.image: amazeeiolagoon/logs-db:v1-13-5 logs-forwarder: image: ${IMAGE_REPO:-lagoon}/logs-forwarder user: '111111111' labels: lagoon.type: custom lagoon.template: services/logs-forwarder/.lagoon.single.yml - lagoon.image: amazeeiolagoon/logs-forwarder:v1-13-4 + lagoon.image: amazeeiolagoon/logs-forwarder:v1-13-5 logs-db-ui: image: ${IMAGE_REPO:-lagoon}/logs-db-ui user: '111111111' @@ -578,14 +578,14 @@ services: labels: lagoon.type: kibana lagoon.template: services/logs-db-ui/.lagoon.yml - lagoon.image: amazeeiolagoon/logs-db-ui:v1-13-4 + lagoon.image: amazeeiolagoon/logs-db-ui:v1-13-5 logs-db-curator: image: ${IMAGE_REPO:-lagoon}/logs-db-curator user: '111111111' labels: lagoon.type: cli lagoon.template: services/logs-db-curator/.lagoon.app.yml - lagoon.image: amazeeiolagoon/logs-db-curator:v1-13-4 + lagoon.image: amazeeiolagoon/logs-db-curator:v1-13-5 logs2logs-db: image: ${IMAGE_REPO:-lagoon}/logs2logs-db user: '111111111' @@ -601,7 +601,7 @@ services: labels: lagoon.type: logstash lagoon.template: services/logs2logs-db/.lagoon.yml - lagoon.image: amazeeiolagoon/logs2logs-db:v1-13-4 + lagoon.image: amazeeiolagoon/logs2logs-db:v1-13-5 auto-idler: image: ${IMAGE_REPO:-lagoon}/auto-idler user: '111111111' @@ -614,7 +614,7 @@ services: labels: lagoon.type: custom lagoon.template: services/auto-idler/.lagoon.yml - lagoon.image: amazeeiolagoon/auto-idler:v1-13-4 + lagoon.image: amazeeiolagoon/auto-idler:v1-13-5 storage-calculator: image: ${IMAGE_REPO:-lagoon}/storage-calculator user: '111111111' @@ -623,7 +623,7 @@ services: labels: lagoon.type: custom lagoon.template: services/storage-calculator/.lagoon.yml - lagoon.image: amazeeiolagoon/storage-calculator:v1-13-4 + lagoon.image: amazeeiolagoon/storage-calculator:v1-13-5 logs-collector: image: openshift/origin-logging-fluentd:v3.6.1 labels: @@ -695,7 +695,7 @@ services: labels: lagoon.type: custom lagoon.template: services/harbor-core/harbor-core.yml - lagoon.image: amazeeiolagoon/harbor-core:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-core:v1-13-5 harbor-database: image: ${IMAGE_REPO:-lagoon}/harbor-database hostname: harbor-database @@ -709,7 +709,7 @@ services: labels: lagoon.type: custom lagoon.template: services/harbor-database/harbor-database.yml - lagoon.image: amazeeiolagoon/harbor-database:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-database:v1-13-5 harbor-jobservice: image: ${IMAGE_REPO:-lagoon}/harbor-jobservice hostname: harbor-jobservice @@ -738,7 +738,7 @@ services: labels: lagoon.type: custom lagoon.template: services/harbor-jobservice/harbor-jobservice.yml - lagoon.image: amazeeiolagoon/harbor-jobservice:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-jobservice:v1-13-5 harbor-nginx: image: ${IMAGE_REPO:-lagoon}/harbor-nginx hostname: harbor-nginx @@ -754,7 +754,7 @@ services: labels: lagoon.type: custom lagoon.template: services/harbor-nginx/harbor-nginx.yml - lagoon.image: amazeeiolagoon/harbor-nginx:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-nginx:v1-13-5 harbor-portal: image: ${IMAGE_REPO:-lagoon}/harbor-portal hostname: harbor-portal @@ -764,7 +764,7 @@ services: labels: lagoon.type: custom lagoon.template: services/harbor-portal/harbor-portal.yml - lagoon.image: amazeeiolagoon/harbor-portal:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-portal:v1-13-5 harbor-redis: image: ${IMAGE_REPO:-lagoon}/harbor-redis hostname: harbor-redis @@ -774,7 +774,7 @@ services: labels: lagoon.type: custom lagoon.template: services/harbor-redis/harbor-redis.yml - lagoon.image: amazeeiolagoon/harbor-redis:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-redis:v1-13-5 harbor-trivy: image: ${IMAGE_REPO:-lagoon}/harbor-trivy hostname: harbor-trivy @@ -806,7 +806,7 @@ services: lagoon.type: custom lagoon.template: services/harbor-trivy/harbor-trivy.yml lagoon.name: harbor-trivy - lagoon.image: amazeeiolagoon/harbor-trivy:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-trivy:v1-13-5 harborregistry: image: ${IMAGE_REPO:-lagoon}/harborregistry hostname: harborregistry @@ -828,7 +828,7 @@ services: lagoon.type: custom lagoon.template: services/harborregistry/harborregistry.yml lagoon.name: harborregistry - lagoon.image: amazeeiolagoon/harborregistry:v1-13-4 + lagoon.image: amazeeiolagoon/harborregistry:v1-13-5 harborregistryctl: image: ${IMAGE_REPO:-lagoon}/harborregistryctl hostname: harborregistryctl @@ -843,10 +843,10 @@ services: lagoon.type: custom lagoon.template: services/harborregistryctl/harborregistry.yml lagoon.name: harborregistry - lagoon.image: amazeeiolagoon/harborregistryctl:v1-13-4 + lagoon.image: amazeeiolagoon/harborregistryctl:v1-13-5 api-redis: image: ${IMAGE_REPO:-lagoon}/api-redis labels: lagoon.type: custom lagoon.template: services/api-redis/.lagoon.app.yml - lagoon.image: amazeeiolagoon/api-redis:v1-13-4 + lagoon.image: amazeeiolagoon/api-redis:v1-13-5 diff --git a/lagoon-remote/docker-compose.yaml b/lagoon-remote/docker-compose.yaml index 4b8a79c8fb..386c8d8dd1 100644 --- a/lagoon-remote/docker-compose.yaml +++ b/lagoon-remote/docker-compose.yaml @@ -29,68 +29,68 @@ services: labels: lagoon.type: custom lagoon.template: docker-host/docker-host.yaml - lagoon.image: amazeeiolagoon/docker-host:v1-13-4 + lagoon.image: amazeeiolagoon/docker-host:v1-13-5 harborclair: image: ${IMAGE_REPO:-lagoon}/harborclair labels: lagoon.type: custom lagoon.template: harborclair/harborclair.yml lagoon.name: harborclair - lagoon.image: amazeeiolagoon/harborclair:v1-13-4 + lagoon.image: amazeeiolagoon/harborclair:v1-13-5 harborclairadapter: image: ${IMAGE_REPO:-lagoon}/harborclairadapter labels: lagoon.type: custom lagoon.template: harborclairadapter/harborclair.yml lagoon.name: harborclair - lagoon.image: amazeeiolagoon/harborclairadapter:v1-13-4 + lagoon.image: amazeeiolagoon/harborclairadapter:v1-13-5 harbor-core: image: ${IMAGE_REPO:-lagoon}/harbor-core labels: lagoon.type: custom lagoon.template: harbor-core/harbor-core.yml - lagoon.image: amazeeiolagoon/harbor-core:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-core:v1-13-5 harbor-database: image: ${IMAGE_REPO:-lagoon}/harbor-database labels: lagoon.type: custom lagoon.template: harbor-database/harbor-database.yml - lagoon.image: amazeeiolagoon/harbor-database:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-database:v1-13-5 harbor-jobservice: image: ${IMAGE_REPO:-lagoon}/harbor-jobservice labels: lagoon.type: custom lagoon.template: harbor-jobservice/harbor-jobservice.yml - lagoon.image: amazeeiolagoon/harbor-jobservice:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-jobservice:v1-13-5 harbor-nginx: image: ${IMAGE_REPO:-lagoon}/harbor-nginx labels: lagoon.type: custom lagoon.template: harbor-nginx/harbor-nginx.yml - lagoon.image: amazeeiolagoon/harbor-nginx:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-nginx:v1-13-5 harbor-portal: image: ${IMAGE_REPO:-lagoon}/harbor-portal labels: lagoon.type: custom lagoon.template: harbor-portal/harbor-portal.yml - lagoon.image: amazeeiolagoon/harbor-portal:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-portal:v1-13-5 harbor-redis: image: ${IMAGE_REPO:-lagoon}/harbor-redis labels: lagoon.type: custom lagoon.template: harbor-redis/harbor-redis.yml - lagoon.image: amazeeiolagoon/harbor-redis:v1-13-4 + lagoon.image: amazeeiolagoon/harbor-redis:v1-13-5 harborregistry: image: ${IMAGE_REPO:-lagoon}/harborregistry labels: lagoon.type: custom lagoon.template: harborregistry/harborregistry.yml lagoon.name: harborregistry - lagoon.image: amazeeiolagoon/harborregistry:v1-13-4 + lagoon.image: amazeeiolagoon/harborregistry:v1-13-5 harborregistryctl: image: ${IMAGE_REPO:-lagoon}/harborregistryctl labels: lagoon.type: custom lagoon.template: harborregistryctl/harborregistry.yml lagoon.name: harborregistry - lagoon.image: amazeeiolagoon/harborregistryctl:v1-13-4 + lagoon.image: amazeeiolagoon/harborregistryctl:v1-13-5