Merge branch '10.0.x' into feat/angular17-portfolios-migration

Author: millyamolo

.gitattributes

@@ -0,0 +1,2 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto eol=lf

.github/workflows/deployment.yml

@@ -10,45 +10,49 @@ on:
   # deployment:
   # workflow_dispatch:
 jobs:
-  docker-deploy-development-image:
-    if: github.repository_owner == 'doubtfire-lms'
-    environment: deployment-secrets
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        if: github.event_name != 'pull_request'
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Setup meta for development image
-        id: docker_meta
-        uses: docker/metadata-action@v5
-        with:
-          images: lmsdoubtfire/doubtfire-web
-          tags: |
-            type=semver,pattern={{major}}.{{minor}}.x-dev
-      - name: Build and push web server
-        id: docker_build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+  # docker-deploy-development-image:
+  #   if: github.repository_owner == 'doubtfire-lms'
+  #   environment: deployment-secrets
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v4
+  #       with:
+  #         submodules: recursive
+  #     - name: Set up Docker Buildx
+  #       uses: docker/setup-buildx-action@v3
+  #     - name: Login to DockerHub
+  #       uses: docker/login-action@v3
+  #       if: github.event_name != 'pull_request'
+  #       with:
+  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
+  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
+  #     - name: Setup meta for development image
+  #       id: docker_meta
+  #       uses: docker/metadata-action@v5
+  #       with:
+  #         images: lmsdoubtfire/doubtfire-web
+  #         tags: |
+  #           type=semver,pattern={{major}}.{{minor}}.x-dev
+  #     - name: Build and push web server
+  #       id: docker_build
+  #       uses: docker/build-push-action@v5
+  #       with:
+  #         context: .
+  #         push: ${{ github.event_name != 'pull_request' }}
+  #         tags: ${{ steps.docker_meta.outputs.tags }}
+  #         labels: ${{ steps.meta.outputs.labels }}
+  #     - name: Image digest
+  #       run: echo ${{ steps.docker_build.outputs.digest }}
   docker-web-server:
     if: github.repository_owner == 'doubtfire-lms'
     environment: deployment-secrets
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub

.gitignore

@@ -11,7 +11,6 @@ vendor/
 .sass-cache*
 .bundle*
 tmp.scss
-.vscode
 .tscache
 a.env
 dist/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "JPlag-Report-Viewer"]
+	path = JPlag-Report-Viewer
+  url = https://github.com/doubtfire-lms/jplag-report-viewer-static.git

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "files.eol": "\n"
+}