DOCKW-70 Dockworker 6.x update

.dockworker/dockworker.yml

@@ -1,26 +1,52 @@
 dockworker:
-  version: '5'
+  version: '6'
   application:
-    name: authentication.unbscholar.lib.unb.ca
-    finish_marker: 'resuming normal operations'
-    project_prefix:
-      - SCHOLAR
-    shell: /bin/bash
-    upstream_images:
-      - httpd:2-bullseye
-    uuid: 3117
-  deployment:
-    environments:
+    name: UNB Scholar Authentication Service
+    uri: https://authentication.unbscholar.lib.unb.ca
+    description: >
+      An apache proxy to authenticate users for UNB Scholar.
+    topics:
+      - auth
+      - apache
+    identifiers:
+      id: authentication.unbscholar.lib.unb.ca
+      slug: authentication-unbscholar-lib-unb-ca
+      short_slug: schoauth
+      uuid: 3117
+    framework:
+      name: Httpd
+      version: 2
+      startup_finished_marker: 'resuming normal operations'
+      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: authentication.unbscholar.lib.unb.ca
-    owner: unb-libraries
-  image:
-    push_branches:
-      - prod
-    name: ghcr.io/unb-libraries/authentication.unbscholar.lib.unb.ca
-    date_tag_image: true
-    repository: ghcr
+    deployments:
+      authentication-unbscholar-lib-unb-ca:
+        default: true
+        managed: true
+        name: authentication-unbscholar-lib-unb-ca
+  workflows:
+    vcs:
+      type: github
+      owner: unb-libraries
+      name: authentication.unbscholar.lib.unb.ca
+    jira:
+      project_keys:
+        - SCHOLAR
+    image:
+      name: ghcr.io/unb-libraries/authentication.unbscholar.lib.unb.ca
+      parent: httpd:2-bullseye
+      repository: GitHub
+      push-branches:
+        - dev
+        - prod

.github/workflows/deployment-workflow.yaml

@@ -1,4 +1,4 @@
-name: authentication.unbscholar.lib.unb.ca
+name: Deploy authentication.unbscholar.lib.unb.ca
 
 on:
   pull_request:
@@ -7,15 +7,16 @@ on:
 
 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: false
       deploy-branches: '["dev","prod"]'
+      image-name: 'ghcr.io/unb-libraries/authentication.unbscholar.lib.unb.ca'
+      k8s-deployment-name: 'authentication-unbscholar-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 }}

.gitignore

@@ -1,7 +1,7 @@
 .gitkeep
 .idea
 vendor
-composer.lock
+/composer.lock
 tests/features/bootstrap
 build/scripts/local
 config-yml/.htaccess

composer.json

@@ -1,7 +1,15 @@
 {
+  "autoload": {
+    "psr-4": {
+      "Dockworker\\": ".dockworker/src"
+    }
+  },
   "config": {
     "preferred-install": {
       "*": "dist"
+    },
+    "allow-plugins": {
+      "php-http/discovery": true
     }
   },
   "description": "Scaffold and provision local development for authentication.unbscholar.lib.unb.ca",
@@ -10,11 +18,11 @@
   "name": "unb-libraries/authentication.unbscholar.lib.unb.ca",
   "prefer-stable": true,
   "require-dev": {
-    "unb-libraries/dockworker": "^5"
+    "unb-libraries/dockworker-daemon": "^6"
   },
   "scripts": {
     "post-update-cmd": [
-      "vendor/bin/dockworker dockworker:git:setup-hooks"
+      "vendor/bin/dockworker git:setup-hooks"
     ]
   }
 }

docker-compose.yml

@@ -1,9 +1,9 @@
 services:
-  authentication.unbscholar.lib.unb.ca:
+  authentication-unbscholar-lib-unb-ca:
     build:
       context: .
     restart: unless-stopped
-    container_name: authentication.unbscholar.lib.unb.ca
+    container_name: authentication-unbscholar-lib-unb-ca
     expose:
       - "80"
     networks: