Merge branch 'buildkit'

.webhook_bridge/pipeline-build-homepage-staging.yaml

@@ -123,7 +123,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: 3411d0cd39a749464bbf70ba40e2ca83ee9e2d02
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:
@@ -136,8 +136,6 @@ spec:
             value: $(params.path-to-dockerfile)
           - name: EXTRA_ARGS
             value:
-              - "--opt"
-              - "target=$(params.target-name)"
               - --import-cache
               - "type=registry,ref=$(params.image-name):buildcache"
               - --export-cache
@@ -232,6 +230,36 @@ spec:
             requests:
               storage: 10Gi
       subPath: rust-source
+    - name: git-source-private
+      volumeClaimTemplate:
+        spec:
+          storageClassName: "nfs-client"
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi
+      subPath: git-source
+    - name: git-source-explorer
+      volumeClaimTemplate:
+        spec:
+          storageClassName: "nfs-client"
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi
+      subPath: git-source
+    - name: git-source-organic
+      volumeClaimTemplate:
+        spec:
+          storageClassName: "nfs-client"
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi
+      subPath: git-source
     - name: docker-credentials
       secret:
         secretName: harbor-plain

.webhook_bridge/pipeline-build-homepage.yaml

@@ -1,7 +1,7 @@
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
-  name: build-homepage
+  name: build-homepage-staging
 spec:
   timeouts:
     pipeline: "2h0m0s"
@@ -135,7 +135,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: 3411d0cd39a749464bbf70ba40e2ca83ee9e2d02
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:
@@ -148,8 +148,6 @@ spec:
             value: $(params.path-to-dockerfile)
           - name: EXTRA_ARGS
             value:
-              - "--opt"
-              - "target=$(params.target-name)"
               - --import-cache
               - "type=registry,ref=$(params.image-name):buildcache"
               - --export-cache
@@ -244,6 +242,36 @@ spec:
             requests:
               storage: 10Gi
       subPath: rust-source
+    - name: git-source-private
+      volumeClaimTemplate:
+        spec:
+          storageClassName: "nfs-client"
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi
+      subPath: git-source
+    - name: git-source-explorer
+      volumeClaimTemplate:
+        spec:
+          storageClassName: "nfs-client"
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi
+      subPath: git-source
+    - name: git-source-organic
+      volumeClaimTemplate:
+        spec:
+          storageClassName: "nfs-client"
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi
+      subPath: git-source
     - name: docker-credentials
       secret:
         secretName: harbor-plain

docker/server/Dockerfile

@@ -49,8 +49,8 @@ RUN --mount=type=tmpfs,target=/tmp --mount=type=cache,target=/usr/local/cargo/re
 FROM alpine:$ALPINE_VERSION AS natter
 COPY --link --from=natter-build /target/release-lto/natter /usr/bin/
 COPY --link . /source
-COPY --link --from=private /homepage_private/static /source/static/
-COPY --link --from=explorer-build /organic_ast_explorer/dist /source/static/organic/ast_explorer/
+COPY --link --from=private /homepage_private/static/* /source/static/
+COPY --link --from=explorer-build /organic_ast_explorer/dist/* /source/static/organic/ast_explorer/
 RUN --network=none --mount=type=tmpfs,target=/tmp natter build --config /source/natter.toml