Merge pull request #3110 from uselagoon/upstreams_and_tidyup

Makefile

@@ -100,7 +100,6 @@ docker_pull:
 
 images :=     oc \
 							kubectl \
-							oc-build-deploy-dind \
 							kubectl-build-deploy-dind \
 							athenapdf-service \
 							docker-host
@@ -132,11 +131,9 @@ $(build-images):
 build/docker-host: images/docker-host/Dockerfile
 build/oc: images/oc/Dockerfile
 build/kubectl: images/kubectl/Dockerfile
-build/oc-build-deploy-dind: build/oc images/oc-build-deploy-dind
 build/athenapdf-service:images/athenapdf-service/Dockerfile
 build/kubectl-build-deploy-dind: build/kubectl images/kubectl-build-deploy-dind
 
-
 #######
 ####### Service Images
 #######
@@ -339,12 +336,6 @@ local-registry-up: build/local-registry
 broker-up: build/broker-single
 	IMAGE_REPO=$(CI_BUILD_TAG) docker-compose -p $(CI_BUILD_TAG) --compatibility up -d broker
 
-lagoon-kickstart: $(foreach image,$(deployment-test-services-rest),build/$(image))
-	IMAGE_REPO=$(CI_BUILD_TAG) CI=false docker-compose -p $(CI_BUILD_TAG) --compatibility up -d $(deployment-test-services-rest)
-	sleep 90
-	curl -X POST -H "Content-Type: application/json" --data 'mutation { deployEnvironmentBranch(input: { project: { name: "lagoon" }, branchName: "master" } )}' http://localhost:3000/graphql
-	make logs
-
 #######
 ####### Publishing Images
 #######

docs/using-lagoon-the-basics/docker-compose-yml.md

@@ -173,21 +173,6 @@ In the example above, the services are named `nginx` and `php` \(but you can cal
 
 In order for Lagoon to realize which one is the `nginx` and which one is the `php` service, we define it via `lagoon.deployment.servicetype: nginx` and `lagoon.deployment.servicetype: php`.
 
-## **Custom Templates \(Openshift only\)**
-
-OpenShift defines templates as follows:
-
-> A template describes a set of objects that can be parameterized and processed to produce a list of objects for creation by OpenShift Container Platform. A template can be processed to create anything you have permission to create within a project, for example services, build configurations, and DeploymentConfigs. A template may also define a set of labels to apply to every object defined in the template.
-
-Lagoon comes with a variety of pre-defined templates, which set all kinds of needed configuration in YAML files. Check out the shipped templates from the [templates folder of `oc-build-deploy-dind`](https://github.com/uselagoon/lagoon/tree/main/images/oc-build-deploy-dind/openshift-templates).
-
-If you need to make changes to the OpenShift templates, you can define your own template via `lagoon.template`.
-
-!!! Note "Note:"
-    The template is called with `oc process`, so you should define the same parameters as seen in the default templates.
-
-You can also overwrite the templates for a specific environment. This is done in [`.lagoon.yml`](lagoon-yml.md#environmentsnametypes)
-
 ## Helm Templates \(Kubernetes only\)
 
 Lagoon uses [Helm](https://helm.sh/) for templating on Kubernetes. To do this, a series of [Charts](https://github.com/uselagoon/lagoon/tree/main/images/kubectl-build-deploy-dind/helmcharts) are included with the `kubectl-build-deploy-dind` service.

images/docker-host/Dockerfile

@@ -1,7 +1,7 @@
 ARG UPSTREAM_REPO
 ARG UPSTREAM_TAG
 FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest} as commons
-FROM docker:20.10.12-dind
+FROM docker:20.10.14-dind
 
 LABEL maintainer="amazee.io"
 ENV LAGOON=docker-host

images/kubectl/Dockerfile

@@ -6,7 +6,7 @@ FROM golang:1.16-alpine3.15 as golang
 RUN apk add --no-cache git
 RUN go get github.com/a8m/envsubst/cmd/envsubst
 
-FROM docker:20.10.12
+FROM docker:20.10.14
 
 LABEL maintainer="amazee.io"
 ENV LAGOON=oc