Merge branch 'staging' of github.com:wikirate/wikirateproject into st…

…aging

.github/workflows/docker-build.yaml

@@ -0,0 +1,40 @@
+name: Build and publish Docker image
+
+on:
+  push:
+    branches: [ main, staging ]
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4.2.2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3.3.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5.5.1
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=raw,value={{sha}}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6.9.0
+        with:
+          push: true
+          file: vendor/decko/docker/repos/decko-k8s.dockerfile
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "card-mods"]
 	path = vendor/card-mods
 	url = https://github.com/decko-commons/card-mods.git
-[submodule "vendor/decko-cap"]
-	path = vendor/decko-cap
-	url = https://github.com/decko-commons/decko-cap
 [submodule "mod/wikirate_project/vendor/slick"]
 	path = mod/wikirate_project/vendor/slick
 	url = https://github.com/kenwheeler/slick.git

Gemfile

@@ -20,6 +20,7 @@ end
 path "./vendor/card-mods" do
   gem "card-mod-social"
   gem "card-mod-filter"
+  gem "card-mod-new_relic"
   gem "card-mod-thumbnail"
   gem "card-mod-google_analytics"
 end
@@ -31,8 +32,6 @@ group :development do
     gem "card-mod-platypus"
     gem "card-mod-monkey"
   end
-
-  gem "decko-cap", path: "./vendor/decko-cap"
 end
 
 group :production do