DOCKW-70 Dockworker 6.x update

.dockworker/dockworker.yml

@@ -1,27 +1,54 @@
 dockworker:
-  version: '5'
+  version: '6'
   application:
-    name: lastshift.lib.unb.ca
-    finish_marker: '99_zz_notify_user_URI'
-    project_prefix: LASTSHIFT
-    upstream_images:
-      - jekyll/jekyll:3.8
-      - ghcr.io/unb-libraries/nginx:1.x
-    uuid: 3112
-  deployment:
-    environments:
+    name: "Last Shift: The Story of a Mill Town"
+    uri: https://lastshift.lib.unb.ca
+    description: >
+      Last Shift: The Story of a Mill Town was inspired by events that unfolded in late 2007 when Abitibi-Bowater announced its intention to close Dalhousie's pulp and paper mill.
+    topics:
+      - dalhousie
+      - new brunswick
+      - pulp and paper
+      - mill town
+    identifiers:
+      id: lastshift.lib.unb.ca
+      slug: lastshift-lib-unb-ca
+      short_slug: lastshift
+      uuid: 3112
+    framework:
+      name: Nginx
+      version: 1
+      startup_finished_marker: 'o.e.j.s.Server Started'
+      endpoint:
+        name: http
+        port: 80
+        readiness_timeout: 15
+    license:
+      license: MIT
+      holder: University of New Brunswick Libraries
+    shell:
+      path: /bin/sh
+  endpoints:
+    env:
       - dev
       - prod
-    workflow:
-      source: dockworker
-      type: deployment-workflow
-  github:
-    repo: lastshift.lib.unb.ca
-    owner: unb-libraries
-  image:
-    push_branches:
-      - dev
-      - prod
-    name: ghcr.io/unb-libraries/lastshift.lib.unb.ca
-    date_tag_image: true
-    repository: ghcr
+    deployments:
+      lastshift-lib-unb-ca:
+        default: true
+        managed: true
+        name: lastshift-lib-unb-ca
+  workflows:
+    vcs:
+      type: github
+      owner: unb-libraries
+      name: lastshift.lib.unb.ca
+    jira:
+      project_keys:
+        - LASTSHIFT
+    image:
+      name: ghcr.io/unb-libraries/lastshift.lib.unb.ca
+      parent: ghcr.io/unb-libraries/nginx:1.x
+      repository: GitHub
+      push-branches:
+        - dev
+        - prod

.github/workflows/deployment-workflow.yaml

@@ -1,21 +1,20 @@
-name: lastshift.lib.unb.ca
-
+name: Deploy lastshift.lib.unb.ca
 on:
   pull_request:
   push:
   workflow_dispatch:
-
 jobs:
   deploy:
-    uses: unb-libraries/dockworker/.github/workflows/deployment-workflow.yaml@5.x
+    uses: unb-libraries/dockworker/.github/workflows/build-push-deploy-notify.yaml@6.x
     with:
+      branch-env-map: '{"dev":"dev","prod":"prod"}'
+      build-themes: true
       deploy-branches: '["dev","prod"]'
+      image-name: 'ghcr.io/unb-libraries/lastshift.lib.unb.ca'
+      k8s-deployment-name: 'lastshift-lib-unb-ca'
+      push-branches: '["dev","prod"]'
     secrets:
-      DOCKER_CLOUD_ACCESS_TOKEN: ${{ secrets.DOCKER_CLOUD_ACCESS_TOKEN }}
-      DOCKER_CLOUD_USER_NAME: ${{ secrets.DOCKER_CLOUD_USER_NAME }}
-      GH_CONTAINER_REGISTRY_TOKEN: ${{ secrets.GH_CONTAINER_REGISTRY_TOKEN }}
-      GH_CONTAINER_REGISTRY_USER: ${{ secrets.GH_CONTAINER_REGISTRY_USER }}
-      KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_DATA }}
-      NEW_RELIC_ACCOUNT_ID: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
-      NEW_RELIC_API_KEY: ${{ secrets.NEW_RELIC_API_KEY }}
+      KUBE_CONFIG: ${{ secrets.KUBE_CONFIG_DATA }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      GH_CONTAINER_REGISTRY_USER: ${{ secrets.GH_CONTAINER_REGISTRY_USER }}
+      GH_CONTAINER_REGISTRY_TOKEN: ${{ secrets.GH_CONTAINER_REGISTRY_TOKEN }}

Dockerfile

@@ -8,15 +8,15 @@ RUN chown jekyll:jekyll / && \
   jekyll build --destination /dist
 
 
-FROM ghcr.io/unb-libraries/nginx:1.x
+FROM ghcr.io/unb-libraries/nginx:3.18.x
 
 ARG BUILD_DATE
 ARG VCS_REF
 ARG VERSION
 
 COPY ./build /build
 RUN cp -r /build/scripts/container/* /scripts/ && \
-  mv /build/nginx/app.conf /etc/nginx/conf.d/app.conf && \
+  mv /build/nginx/app.conf "$NGINX_APP_CONF_FILE" && \
   rm -rf /build && \
   rm -rf /app/html
 COPY --from=jekyll /dist /app/html

composer.json

@@ -14,11 +14,11 @@
   "name": "unb-libraries/lastshift.lib.unb.ca",
   "prefer-stable": true,
   "require-dev": {
-    "unb-libraries/dockworker-jekyll": "^5"
+    "unb-libraries/dockworker-jekyll": "^6"
   },
   "scripts": {
     "post-update-cmd": [
-      "vendor/bin/dockworker dockworker:git:setup-hooks",
+      "vendor/bin/dockworker git:setup-hooks",
       "vendor/bin/dockworker local:jekyll:update-builder"
     ]
   }

docker-compose.yml

@@ -1,9 +1,9 @@
 services:
-  lastshift.lib.unb.ca:
+  lastshift-lib-unb-ca:
     build:
       context: .
     restart: unless-stopped
-    container_name: lastshift.lib.unb.ca
+    container_name: lastshift-lib-unb-ca
     expose:
       - "80"
     ports:
@@ -18,7 +18,7 @@ services:
     build:
       context: builder
     restart: unless-stopped
-    container_name: builder.lastshift.lib.unb.ca
+    container_name: builder-lastshift-lib-unb-ca
     networks:
       - lastshift.lib.unb.ca
     volumes: