Fix loading the PGP WKD and AST explorer into the homepage image.

Add back in docker targets.
Update version of BuiltKit task.
2025-01-12 18:11:04 -05:00 · 2024-10-20 23:14:04 -04:00 · 2024-10-20 21:52:06 -04:00 · 2024-10-20 19:40:14 -04:00 · 2024-10-20 19:40:04 -04:00
3 changed files with 8 additions and 64 deletions
--- a/.webhook_bridge/pipeline-build-homepage-staging.yaml
+++ b/.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: 3411d0cd39a749464bbf70ba40e2ca83ee9e2d02
+              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
            - name: pathInRepo
              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
        params:
@@ -136,6 +136,8 @@ 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
@@ -230,36 +232,6 @@ 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
--- a/.webhook_bridge/pipeline-build-homepage.yaml
+++ b/.webhook_bridge/pipeline-build-homepage.yaml
@@ -135,7 +135,7 @@ spec:
            - name: url
              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
            - name: revision
-              value: 3411d0cd39a749464bbf70ba40e2ca83ee9e2d02
+              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
            - name: pathInRepo
              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
        params:
@@ -148,6 +148,8 @@ 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
@@ -242,36 +244,6 @@ 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
--- a/docker/server/Dockerfile
+++ b/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
Author	SHA1	Message	Date
Tom Alexander	330a80c8b5	Fix loading the PGP WKD and AST explorer into the homepage image. All checks were successful semver Build semver has succeeded Details build-staging Build build-staging has succeeded Details build Build build has succeeded Details	2025-01-12 18:11:04 -05:00
Tom Alexander	6ab922beed	Add back in docker targets. All checks were successful semver Build semver has succeeded Details build Build build has succeeded Details build-staging Build build-staging has succeeded Details	2024-10-20 23:14:04 -04:00
Tom Alexander	98161251e3	Update version of BuiltKit task. All checks were successful semver Build semver has succeeded Details build Build build has succeeded Details build-staging Build build-staging has succeeded Details This version does not launch the ssh agent if no keys are mounted.	2024-10-20 21:52:06 -04:00
Tom Alexander	1422b00208	Merge branch 'buildkit' All checks were successful semver Build semver has succeeded Details build-staging Build build-staging has succeeded Details build Build build has succeeded Details	2024-10-20 19:40:14 -04:00
Tom Alexander	2fa772934d	Remove extra volumes.	2024-10-20 19:40:04 -04:00