fix: update devcontainer template structure (#1132)

* fix: update devcontainer template structure

* chore: fix linter findings

* chore: correct hadolint execlude regex

* chore: fix line endings

Author: rjaegers

.github/workflows/release-build.yml

@@ -138,27 +138,9 @@ jobs:
 
   publish-devcontainer-templates:
     name: 📝 Publish templates
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/wc-publish-templates.yml
     permissions:
       packages: write # is needed by devcontainers/action to write templates as OCI artifacts
-    steps:
-      - uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
-        with:
-          disable-sudo: true
-          egress-policy: audit
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-      - uses: devcontainers/action@1082abd5d2bf3a11abccba70eef98df068277772 # v1.4.3
-        with:
-          disable-repo-tagging: true
-          publish-templates: true
-          base-path-to-templates: .devcontainer
 
   generate-documents:
     name: 📄 Documentation

.github/workflows/wc-publish-templates.yml

@@ -0,0 +1,32 @@
+---
+name: Publish Templates
+
+on:
+  workflow_call:
+
+permissions: {}
+
+jobs:
+  publish-devcontainer-templates:
+    name: 📝 Publish templates
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write # is needed by devcontainers/action to write templates as OCI artifacts
+    steps:
+      - uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        with:
+          disable-sudo: true
+          egress-policy: audit
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+      - uses: devcontainers/action@1082abd5d2bf3a11abccba70eef98df068277772 # v1.4.3
+        with:
+          disable-repo-tagging: true
+          publish-templates: true
+          base-path-to-templates: templates

.mega-linter.yml

@@ -21,7 +21,7 @@ PRINT_ALPACA: false
 SHOW_SKIPPED_LINTERS: false
 SPELL_LYCHEE_FILE_EXTENSIONS:
   [".feature", ".json", ".md", ".md.j2", ".txt", ".yaml", ".yml"]
-DOCKERFILE_HADOLINT_FILTER_REGEX_EXCLUDE: (\.devcontainer/.*-template/.*$)
+DOCKERFILE_HADOLINT_FILTER_REGEX_EXCLUDE: (templates)
 FILTER_REGEX_EXCLUDE: (CHANGELOG.md|package-lock.json)
 # tasks.json is wrongfully matched against another schema,
 # and schemas for .vscode/[tasks.json|launch.json] are built

…er/cpp-template/.devcontainer/Dockerfile templates/cpp/.devcontainer/Dockerfile.devcontainer/cpp-template/.devcontainer/Dockerfile renamed to templates/cpp/.devcontainer/Dockerfile .devcontainer/cpp-template/.devcontainer/Dockerfile renamed to templates/cpp/.devcontainer/Dockerfile

@@ -7,4 +7,4 @@ updates:
     schedule:
       interval: weekly
     cooldown:
-      default-days: 5
+      default-days: 7

…template/.devcontainer/devcontainer.json …ates/cpp/.devcontainer/devcontainer.json.devcontainer/cpp-template/.devcontainer/devcontainer.json renamed to templates/cpp/.devcontainer/devcontainer.json .devcontainer/cpp-template/.devcontainer/devcontainer.json renamed to templates/cpp/.devcontainer/devcontainer.json

@@ -1,22 +1,17 @@
 {
-  "id": "cpp-template",
+  "id": "cpp",
   "version": "6.7.1",
-  "name": "amp-devcontainer-cpp",
+  "name": "C++",
   "description": "A modern, batteries-included software development environment for C++",
   "documentationURL": "https://github.com/philips-software/amp-devcontainer/blob/main/README.md",
   "licenseURL": "https://github.com/philips-software/amp-devcontainer/blob/main/LICENSE",
-  "publisher": "philips-software",
   "options": {
     "imageVersion": {
       "type": "string",
       "description": "amp-devcontainer version",
       "default": "6.7.1"
     }
   },
-  "optionalPaths": [
-    ".github/dependabot.yml"
-  ],
-  "platforms": [
-    "Any"
-  ]
+  "optionalPaths": [".github/dependabot.yml"],
+  "platforms": ["Any"]
 }

…iner/cpp-template/.github/dependabot.yml templates/cpp/.github/dependabot.yml.devcontainer/cpp-template/.github/dependabot.yml renamed to templates/cpp/.github/dependabot.yml .devcontainer/cpp-template/.github/dependabot.yml renamed to templates/cpp/.github/dependabot.yml

@@ -7,4 +7,4 @@ updates:
     schedule:
       interval: weekly
     cooldown:
-      default-days: 5
+      default-days: 7