Merge pull request #714 from freeCodeCamp/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.devcontainer/Dockerfile

@@ -0,0 +1,60 @@
+name: Docker -- GHCR - Gitpod
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - 'docker/gitpod/*'
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        images:
+          - gitpod
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3
+
+      - name: Log in to the GHCR
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Cache Docker layers
+        uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ matrix.images }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-${{ matrix.images }}-
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
+        with:
+          context: ./docker/${{ matrix.images }}
+          push: true
+          tags: |
+            ghcr.io/freecodecamp/${{ matrix.images }}:${{ github.sha }}
+            ghcr.io/freecodecamp/${{ matrix.images }}:latest
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+      - name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.devcontainer/devcontainer.json

@@ -1,5 +1,4 @@
-image:
-  file: .gitpod.Dockerfile
+image: ghcr.io/freecodecamp/gitpod:latest
 ports:
   - port: 27017 # mongodb
     onOpen: ignore
@@ -19,6 +18,14 @@ ports:
     visibility: public
   - port: 3300 # challenge editor client
     visibility: public
+  - port: 8025 # MailHog
+    visibility: public
+    onOpen: ignore
+  - port: 1025 # MailHog
+    onOpen: ignore
+  - port: 9323 # Playwright
+    visibility: public
+    onOpen: ignore
 
 tasks:
   - before: |

.github/workflows/docker-ghcr.yml

@@ -61,12 +61,16 @@ describe('auth0 routes', () => {
     });
 
     it('should be rate-limited', async () => {
-      await Promise.all(
-        [...Array(10).keys()].map(() => superGet('/mobile-login'))
-      );
-
+      // Rather than spamming the endpoint, we can check the headers.
       const res = await superGet('/mobile-login');
-      expect(res.status).toBe(429);
+      // These headers are semi-official
+      // https://www.ietf.org/archive/id/draft-polli-ratelimit-headers-02.html
+      // so should not depend on the details of the rate-limiting library
+      expect(res.headers['ratelimit-limit']).toBe('10');
+      expect(res.headers['ratelimit-remaining']).toBe('9');
+
+      const res2 = await superGet('/mobile-login');
+      expect(res2.headers['ratelimit-remaining']).toBe('8');
     });
 
     it('should return 401 if the authorization header is invalid', async () => {

.gitpod.Dockerfile

@@ -30,6 +30,37 @@
         "name": "tests the conversion rate of the new design comparing to the old one"
       }
     ]
+  },
+  "show-modal-randomly": {
+    "defaultValue": false,
+    "rules": [
+      {
+        "coverage": 1,
+        "hashAttribute": "id",
+        "seed": "show-modal-randomly",
+        "hashVersion": 2,
+        "variations": [
+          false,
+          true
+        ],
+        "weights": [
+          0.5,
+          0.5
+        ],
+        "key": "show-modal-randomly",
+        "meta": [
+          {
+            "key": "0",
+            "name": "Control"
+          },
+          {
+            "key": "1",
+            "name": "Variation 1"
+          }
+        ],
+        "phase": "0",
+        "name": "stg show modal randomly"
+      }
+    ]
   }
-}
-
+}