Merge branch 'master' into add-whitelisting-based-on-ip-and-user-agent

poespas · web-flow · commit 650b1b347482 · 2025-03-31T11:21:04.000+02:00
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -12,7 +12,6 @@
     },
     "vscode": {
       "extensions": [
-        "bierner.markdown-mermaid",
         "davidanson.vscode-markdownlint",
         "ms-python.python"
       ]
diff --git a/.github/workflows/cleanup_acceptance.yaml b/.github/workflows/cleanup_acceptance.yaml
@@ -7,7 +7,7 @@ on:
 jobs:
   cleanup:
     runs-on: ubuntu-latest
-    container: quay.io/hypernode/deploy:4-php8.3-node20
+    container: quay.io/hypernode/deploy:latest-php8.3-node20
     environment: acceptance
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -12,7 +12,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: quay.io/hypernode/deploy:4-php8.3-node20
+    container: quay.io/hypernode/deploy:latest-php8.3-node20
     steps:
       - uses: actions/checkout@v3
         with:
@@ -47,7 +47,7 @@ jobs:
       name: acceptance
       url: ${{ steps.get_brancher_hostname.outputs.BRANCHER_URL }}
     if: github.ref != 'refs/heads/master'
-    container: quay.io/hypernode/deploy:4-php8.3-node20
+    container: quay.io/hypernode/deploy:latest-php8.3-node20
     steps:
       - uses: actions/checkout@v3
         with:
@@ -102,7 +102,7 @@ jobs:
       name: production
       url: https://docs.hypernode.io
     if: github.ref == 'refs/heads/master'
-    container: quay.io/hypernode/deploy:4-php8.3-node20
+    container: quay.io/hypernode/deploy:latest-php8.3-node20
     steps:
       - uses: actions/checkout@v3
       - name: download build artifact
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -0,0 +1,29 @@
+name: Run linting and suggest changes
+
+on:
+  pull_request:
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.10']
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          pip install -r requirements/base.txt
+      - name: Check markdown format
+        run: mdformat docs/
+      - uses: parkerbxyz/suggest-changes@v1
+        with:
+          event: 'REQUEST_CHANGES'
diff --git a/docs/best-practices/database/how-to-run-rabbitmq-on-hypernode.md b/docs/best-practices/database/how-to-run-rabbitmq-on-hypernode.md
@@ -85,7 +85,7 @@ To configure RabbitMQ in Magento 2, you can run the following command:
 
 ```bash
 bin/magento setup:config:set \
-    --amqp-host="rabbitmqmaster" \
+    --amqp-host="rabbitmq" \
     --amqp-port="5672" \
     --amqp-user="guest" \
     --amqp-password="guest" \
diff --git a/docs/conf.py b/docs/conf.py
@@ -48,7 +48,6 @@
     "hypernode.sphinx.extensions.updated_at",
     "hypernode.sphinx.extensions.meta_robots",
     "hypernode.sphinx.extensions.github_actions_logging",
-    "sphinxcontrib.mermaid",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/docs/hypernode-deploy/getting-started/configure-ci-cd.md b/docs/hypernode-deploy/getting-started/configure-ci-cd.md
@@ -103,8 +103,8 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    # Here we use the Hypernode Deploy v4 image with PHP 8.3 and Node.js 20
-    container: quay.io/hypernode/deploy:4-php8.3-node20
+    # Here we use the latest Hypernode Deploy image with PHP 8.3 and Node.js 20
+    container: quay.io/hypernode/deploy:latest-php8.3-node20
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -137,8 +137,8 @@ jobs:
   deploy:
     needs: build
     runs-on: ubuntu-latest
-    # Here we use the Hypernode Deploy v4 image with PHP 8.3 and Node.js 20
-    container: quay.io/hypernode/deploy:4-php8.3-node20
+    # Here we use the latest Hypernode Deploy image with PHP 8.3 and Node.js 20
+    container: quay.io/hypernode/deploy:latest-php8.3-node20
     steps:
       - uses: actions/checkout@v2
       - name: download build artifact
diff --git a/docs/hypernode-deploy/pipelines/bitbucket-pipelines.md b/docs/hypernode-deploy/pipelines/bitbucket-pipelines.md
@@ -58,7 +58,8 @@ Create the file `bitbucket-pipelines.yml` with the contents below.
 This workflow will be used in other workflows.
 
 ```yaml
-image: quay.io/hypernode/deploy:4-php8.3-node20
+# Here we use the latest Hypernode Deploy image with PHP 8.3 and Node.js 20
+image: quay.io/hypernode/deploy:latest-php8.3-node20
 
 definition:
   steps:
@@ -74,10 +75,7 @@ definition:
 Don't forget to set the specifications of the image to what your project needs. The same goes for the deploy steps.
 For example, if your project needs PHP 8.3 and Node.js 20, set the image to:
 ```yaml
-jobs:
-  build:
-    container: quay.io/hypernode/deploy:4-php8.3-node20
-    ...
+image: quay.io/hypernode/deploy:latest-php8.3-node20
 ```
 ````
 
diff --git a/docs/hypernode-deploy/pipelines/github-actions.md b/docs/hypernode-deploy/pipelines/github-actions.md
@@ -57,7 +57,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: quay.io/hypernode/deploy:4-php8.3-node20
+    # See https://quay.io/repository/hypernode/deploy?tab=tags for all possible tags.
+    container: quay.io/hypernode/deploy:latest-php8.3-node20
     steps:
     - uses: actions/checkout@v3
     - uses: actions/cache@v3
@@ -82,7 +83,7 @@ For example, if your project needs PHP 8.3 and Node.js 20, set the image to:
 ```yaml
 jobs:
   build:
-    container: quay.io/hypernode/deploy:4-php8.3-node20
+    container: quay.io/hypernode/deploy:latest-php8.3-node20
     ...
 ```
 ````
@@ -112,7 +113,7 @@ jobs:
     environment:
       name: production
       url: https://www.example.com
-    container: quay.io/hypernode/deploy:4-php8.3-node20
+    container: quay.io/hypernode/deploy:latest-php8.3-node20
     steps:
     - uses: actions/checkout@v3
     - name: download build artifact
@@ -156,7 +157,7 @@ jobs:
     environment:
       name: acceptance
       url: https://acceptance.example.com
-    container: quay.io/hypernode/deploy:4-php8.3-node20
+    container: quay.io/hypernode/deploy:latest-php8.3-node20
     steps:
     - uses: actions/checkout@v3
     - name: download build artifact
diff --git a/docs/hypernode-deploy/pipelines/gitlab-ci.md b/docs/hypernode-deploy/pipelines/gitlab-ci.md
@@ -49,7 +49,7 @@ This sets the container image, defines the CI/CD stages and defines the build st
 
 ```yaml
 # See https://quay.io/repository/hypernode/deploy?tab=tags for all possible tags.
-image: quay.io/hypernode/deploy:4-php8.3-node20
+image: quay.io/hypernode/deploy:latest-php8.3-node20
 
 stages:
   - build
@@ -72,7 +72,7 @@ build:
 Don't forget to set the specifications of the image to what your project needs.
 For example, if your project needs PHP 8.3 and Node.js 16, set the image to:
 ```yaml
-image: quay.io/hypernode/deploy:3-php8.3-node16
+image: quay.io/hypernode/deploy:latest-php8.3-node16
 ```
 ````
 
diff --git a/docs/hypernode-platform/autoscaling/how-does-horizontal-autoscaling-work.md b/docs/hypernode-platform/autoscaling/how-does-horizontal-autoscaling-work.md
@@ -202,7 +202,7 @@ More information about [Elasticsearch on Hypernode](../../hypernode-platform/too
 
 #### Make sure RabbitMQ configured properly
 
-Please make sure RabbitMQ host is set to `rabbitmqmaster` in the Magento 2 configuration file at `<magento_root>/app/etc/env.php`
+Please make sure RabbitMQ host is set to `rabbitmq` in the Magento 2 configuration file at `<magento_root>/app/etc/env.php`
 More information about [RabbitMQ on Hypernode](../../best-practices/database/how-to-run-rabbitmq-on-hypernode.md)
 
 There is a rabbitmq user provisioned by Hypernode called `hypernode-admin` as a non-default user, but you can also configure RabbitMQ with a new different user of your own.
@@ -212,7 +212,7 @@ For example, you can run the following command to change your RabbitMQ config in
 
 ```bash
 bin/magento setup:config:set \
-    --amqp-host="rabbitmqmaster" \
+    --amqp-host="rabbitmq" \
     --amqp-user="my_rabbitmq_user" \
     --amqp-password="my_rabbitmq_password"
 ```
diff --git a/docs/hypernode-platform/tools/how-to-deploy-your-application-using-hypernode-deploy-v1.md b/docs/hypernode-platform/tools/how-to-deploy-your-application-using-hypernode-deploy-v1.md
@@ -166,7 +166,7 @@ defaults:
 jobs:
  build:
  runs-on: ubuntu-latest
- container: quay.io/hypernode/deploy:4-php8.3-node20
+ container: quay.io/hypernode/deploy:latest-php8.3-node20
  steps:
  - uses: actions/checkout@v2
  - uses: actions/cache@v2
@@ -186,7 +186,7 @@ jobs:
  deploy_staging:
    needs: build
    runs-on: ubuntu-latest
-   container: quay.io/hypernode/deploy:4-php8.3-node20
+   container: quay.io/hypernode/deploy:latest-php8.3-node20
    steps:
    - uses: actions/checkout@v2
    - name: download build artifact
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -10,7 +10,6 @@ mdformat-frontmatter==0.4.1
 sphinx-notfound-page==0.8.3
 sphinx-sitemap==2.4.0
 GitPython==3.1.30
-sphinxcontrib-mermaid==0.7.1
 
 # hypernode/ requirements
 beautifulsoup4==4.11.1

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`},`
`13`	`13`	`"vscode": {`
`14`	`14`	`"extensions": [`
`15`		`- "bierner.markdown-mermaid",`
`16`	`15`	`"davidanson.vscode-markdownlint",`
`17`	`16`	`"ms-python.python"`
`18`	`17`	`]`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@`
`48`	`48`	`"hypernode.sphinx.extensions.updated_at",`
`49`	`49`	`"hypernode.sphinx.extensions.meta_robots",`
`50`	`50`	`"hypernode.sphinx.extensions.github_actions_logging",`
`51`		`- "sphinxcontrib.mermaid",`
`52`	`51`	`]`
`53`	`52`
`54`	`53`	`# Add any paths that contain templates here, relative to this directory.`