stsstack-bundles

Merge ~tiago.pasqualini/stsstack-bundles:fix_docker into stsstack-bundles:master

  1. Git
  2. lp:~tiago.pasqualini/stsstack-bundles
  3. fix_docker
  4. Merge into master
Proposed by Tiago Pasqualini da Silva
Status: Merged
Merged at revision: f366aedd602b42ec666e4d6c25decc39903b5a12
Proposed branch: ~tiago.pasqualini/stsstack-bundles:fix_docker
Merge into: stsstack-bundles:master
Diff against target: 12 lines (+1/-0)
1 file modified
kubernetes/pipeline/02configure (+1/-0)
Reviewer Review Type Date Requested Status
Jolly Bundlers Pending
Review via email: mp+410693@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/kubernetes/pipeline/02configure b/kubernetes/pipeline/02configure
2index 960b4df..2d5c04c 100644
3--- a/kubernetes/pipeline/02configure
4+++ b/kubernetes/pipeline/02configure
5@@ -126,6 +126,7 @@ do
6 --docker)
7 conflicts_with $1 --containerd
8 MOD_OVERLAYS+=( "k8s-docker.yaml" )
9+ MOD_PARAMS[__CONTAINER_RUNTIME__]='docker'
10 ;;
11 --docker-registry)
12 MOD_OVERLAYS+=( "k8s-docker-registry.yaml" )

Subscribers

People subscribed via source and target branches