general cleanup of j7s-os tasks. Prep hookbot.

tasks/j7s-os-buildah.yaml

@@ -12,6 +12,8 @@ spec:
     description: Repo directory to put inside the image.
   - name: registry
     description: Registry to push to.
+  - name: version
+    description: Version for the image.
   workspaces:
   - name: source
   steps:
@@ -25,9 +27,9 @@ spec:
       # Build
       buildah --storage-driver=overlay bud --tls-verify=false --no-cache \
         --build-arg commit=./$(params.commit) \
-        -f ./hosting/Dockerfile -t $(params.image) .
+        -f ./hosting/Dockerfile -t $(params.image):$(params.version) .
       # Push
-      buildah --storage-driver=overlay push --tls-verify=false $(params.image) docker://$(params.registry)/$(params.image)
+      buildah --storage-driver=overlay push --tls-verify=false $(params.image) docker://$(params.registry)/$(params.image):$(params.version)
     env:
     - name: USERNAME
       valueFrom:

tasks/j7s-os-image-build.yaml

@@ -7,6 +7,8 @@ spec:
   - name: source
   params:
   - name: image-name
+  results:
+  - name: version-string
   steps:
   - image: 192.168.1.128:8443/j7s-image-build:latest
     securityContext:
@@ -15,4 +17,5 @@ spec:
       set -x
       sudo chown -R j7s:j7s $(workspaces.source.path)
       cd $(workspaces.source.path)
-      make $(params.image-name)
+      make $(params.image-name)
+      echo -n `date +%Y%m%d%H%M`-`git describe --no-match --always --dirty` | tee $(results.version-string.path)

tasks/j7s-os-k8s-deploy.yaml

@@ -8,6 +8,8 @@ spec:
       description: The name of the deployment to patch.
     - name: image
       description: The image to deploy.
+    - name: version
+      description: The version of the image to deploy.
   steps:
     - name: kubectl
       image: gcr.io/cloud-builders/kubectl@sha256:c855d060ac961bc7e6bff42d6b9d9ebebee304eca4cce4a2202e51a5da26c043
@@ -21,5 +23,5 @@ spec:
               spec:
                   containers:
                   - name: j7s-os-app
-                    image: $(params.image)
+                    image: $(params.image):$(params.version)
         EOF