chore(charts): finalize deployment-registry-prepopulate

Substra · Jun 20, 2023 · dd1ef97 · dd1ef97
1 parent 265038f
commit dd1ef97
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/charts/substra-backend/Chart.lock b/charts/substra-backend/Chart.lock
@@ -12,4 +12,4 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 11.6.5
 digest: sha256:b561368b783d0059338aded55c7649355a5f341d8d61e72bfcd63b757371e561
-generated: "2023-06-19T16:59:39.174321+02:00"
+generated: "2023-06-20T11:31:42.095689+02:00"
diff --git a/charts/substra-backend/templates/deployment-registry-prepopulate.yaml b/charts/substra-backend/templates/deployment-registry-prepopulate.yaml
@@ -26,21 +26,21 @@ spec:
         command: ['dockerize', '-wait', 'tcp://{{ $.Release.Name }}-docker-registry:5000']
       - name: {{ $.Values.builder.name }}
         image: {{ include "common.images.name" $.Values.builder.image }}
-        command: ['/usr/bin/buildctl-deamonless.sh']
+        command: ['buildctl-daemonless.sh', 'build']
         args: [
-          'build',
-          '--frontend dockerfile.v0',
-          '--local context=/docker-context',
-          '--local dockerfile=/docker-context',
+          '--frontend', 'dockerfile.v0',
+          '--local', 'context=/docker-context',
+          '--local', 'dockerfile=/docker-context',
+          '--output',
           {{- if .dstImage }}
-          '--output type=image,name={{ $.Release.Name }}-docker-registry:5000/{{ .dstImage }},push=true,registry.insecure=true',
+          'type=image,"name={{ $.Release.Name }}-docker-registry:5000/{{ .dstImage }}",push=true,registry.insecure=true',
           {{- else }}
-          '--output type=image,name={{ $.Release.Name }}-docker-registry:5000/{{ .image }},push=true,registry.insecure=true',
+          'type=image,"name={{ $.Release.Name }}-docker-registry:5000/{{ .image }}",push=true,registry.insecure=true',
           {{ end }}
         ]
         env:
-          - name: BUILDKIT_FLAGS
-            value: --oce-worker-no-process-sandbox
+          - name: "BUILDKITD_FLAGS"
+            value: "--oci-worker-no-process-sandbox"
         volumeMounts:
           - name: dockerfile
             mountPath: /docker-context

diff --git a/charts/substra-backend/values.yaml b/charts/substra-backend/values.yaml
@@ -598,7 +598,8 @@ builder:
   image:
     # registry: gcr.io
     repository: moby/buildkit
-    tag: master-rootless@sha256:cb63454a66f5bba35eba3926962fb5a18912aa3e57629f69c714a0cd303241ce
+    tag: master-rootless
+    # tag: master-rootless@sha256:cb63454a66f5bba35eba3926962fb5a18912aa3e57629f69c714a0cd303241ce
   ## @param kaniko.mirror If set to `true` pull base images from the local registry.
   ##
   mirror: false