Skip to content

Commit f1af89c

Browse files
authored
Merge branch 'master' into docsearch-earch
2 parents 6b0140f + d52ca53 commit f1af89c

22 files changed

+279
-158
lines changed

.github/workflows/cleanup_acceptance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
cleanup:
99
runs-on: ubuntu-latest
10-
container: quay.io/hypernode/deploy:latest-php8.3-node20
10+
container: quay.io/hypernode/deploy:latest-php8.4-node22
1111
environment: acceptance
1212
steps:
1313
- uses: actions/checkout@v2

.github/workflows/deploy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
jobs:
1313
build:
1414
runs-on: ubuntu-latest
15-
container: quay.io/hypernode/deploy:latest-php8.3-node20
15+
container: quay.io/hypernode/deploy:latest-php8.4-node22
1616
steps:
1717
- uses: actions/checkout@v3
1818
with:
@@ -47,7 +47,7 @@ jobs:
4747
name: acceptance
4848
url: ${{ steps.get_brancher_hostname.outputs.BRANCHER_URL }}
4949
if: github.ref != 'refs/heads/master'
50-
container: quay.io/hypernode/deploy:latest-php8.3-node20
50+
container: quay.io/hypernode/deploy:latest-php8.4-node22
5151
steps:
5252
- uses: actions/checkout@v3
5353
with:
@@ -102,7 +102,7 @@ jobs:
102102
name: production
103103
url: https://docs.hypernode.io
104104
if: github.ref == 'refs/heads/master'
105-
container: quay.io/hypernode/deploy:latest-php8.3-node20
105+
container: quay.io/hypernode/deploy:latest-php8.4-node22
106106
steps:
107107
- uses: actions/checkout@v3
108108
- name: download build artifact

bin/watch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ from time import sleep
77

88

99
def build_docs():
10-
subprocess.check_call("bin/build_docs")
10+
subprocess.run("bin/build_docs")
1111

1212

1313
def refresh_assets():

docs/conf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121

2222
# -- Project information -----------------------------------------------------
2323

24-
project = "Docs"
24+
project = "Documentation"
25+
html_title = "Hypernode Documentation"
2526
current_year = datetime.now().year
2627
copyright = f"{current_year}, Hypernode"
2728
author = "Hypernode"
2829

2930
# The full version, including alpha/beta/rc tags
30-
release = "dev"
31+
release = "latest"
3132

3233

3334
# -- General configuration ---------------------------------------------------

docs/ecommerce-applications/magento-2/how-to-configure-remote-storage-for-magento-2-x.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ This can be useful for many reasons, such as:
2222

2323
Configuring Magento 2 to start storing files in your bucket is done using a single command.
2424

25+
Before configuring remote storage, make sure that the deprecated database media storage backend is disabled.
26+
27+
```bash
28+
bin/magento setup:config:set system/media_storage_configuration/media_storage 0
29+
```
30+
2531
**Hypernode Object Storage and other S3 compatible providers**
2632

2733
If you're using Hypernode Object Storage or a different provider than AWS S3, you need to specify the `--remote-storage-endpoint` option.
@@ -39,7 +45,7 @@ bin/magento setup:config:set \
3945
For Hypernode Object Storage, use `main` as the bucket name and `EU` as the region. You can retrieve the remaining parameters by running `hypernode-object-storage info --with-credentials`.
4046

4147
```console
42-
app@testapp ~ # hypernode-object-storage info --with-credentials
48+
app@abcdef-example-magweb-cml:~$ hypernode-object-storage info --with-credentials
4349
+--------------------------------------+----------------+---------+-------------+-------------------------------------+---------------+---------------+
4450
| UUID | Name | Plan | Hypernodes | Management URL | Access Key | Secret Key |
4551
+--------------------------------------+----------------+---------+-------------+-------------------------------------+---------------+---------------+
@@ -93,6 +99,10 @@ aws s3 sync var/import_export s3://my_bucket_name/import_export
9399

94100
Both methods are significantly faster than Magento’s built-in sync, as aws s3 sync handles uploads concurrently.
95101

102+
```{tip}
103+
More information about the `hypernode-object-storage` commands can be found in the [Object Storage documentation](../../hypernode-platform/object-storage.md).
104+
```
105+
96106
## The storage flag file in the bucket
97107

98108
Magento's S3 implementation creates a test file called `storage.flag`, which is basically created to test if the connection works. So this is not a magic file to mark anything ([source](https://github.com/magento/magento2/blob/6f4805f82bb7511f72935daa493d48ebda3d9039/app/code/Magento/AwsS3/Driver/AwsS3.php#L104)).
@@ -121,6 +131,12 @@ If you’re using Amazon S3, ensure that your S3 bucket policies are properly co
121131
}
122132
```
123133

134+
## Remote storage tweaks module
135+
136+
After configuring remote storage for Magento 2, you might run into some slower pages in the admin product grid. This is caused by an inefficient image loading mechanism found in the Magento core code. For now we have written a Magento 2 module to fix this performance problem.
137+
138+
You can find the module on [GitHub](https://github.com/ByteInternet/magento2-remote-storage-tweaks/) and [Packagist](https://packagist.org/packages/hypernode/magento2-remote-storage-tweaks).
139+
124140
## Magento remote storage documentation
125141

126142
- [Configure Remote Storage](https://experienceleague.adobe.com/en/docs/commerce-operations/configuration-guide/storage/remote-storage/remote-storage)

docs/ecommerce-applications/shopware-6/how-to-configure-remote-storage-for-shopware-6-x.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ shopware:
4343
You can get the required management URL, access key, and secret key by running `hypernode-object-storage info` with the `--with-credentials` flag:
4444

4545
```console
46-
app@testapp ~ # hypernode-object-storage info --with-credentials
46+
app@abcdef-example-magweb-cmbl:~$ hypernode-object-storage info --with-credentials
4747
+--------------------------------------+----------------+---------+-------------+-------------------------------------+---------------+---------------+
4848
| UUID | Name | Plan | Hypernodes | Management URL | Access Key | Secret Key |
4949
+--------------------------------------+----------------+---------+-------------+-------------------------------------+---------------+---------------+
@@ -95,6 +95,10 @@ Alternatively, you can use the AWS CLI directly:
9595
aws s3 sync public/media/ s3://bucket_name/media/
9696
```
9797

98+
```{tip}
99+
More information about the `hypernode-object-storage` command can be found in the [Object Storage documentation](../../hypernode-platform/object-storage.md).
100+
```
101+
98102
## Serving assets from your S3 bucket
99103

100104
To serve media assets directly from your S3 bucket, you need to adjust your nginx configuration.

docs/hypernode-deploy/getting-started/configure-ci-cd.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ env:
103103
jobs:
104104
build:
105105
runs-on: ubuntu-latest
106-
# Here we use the latest Hypernode Deploy image with PHP 8.3 and Node.js 22
107-
container: quay.io/hypernode/deploy:latest-php8.3-node22
106+
# Here we use the latest Hypernode Deploy image with PHP 8.4 and Node.js 22
107+
container: quay.io/hypernode/deploy:latest-php8.4-node22
108108
steps:
109109
- uses: actions/checkout@v2
110110
- uses: actions/cache@v2
@@ -118,7 +118,7 @@ jobs:
118118
env:
119119
DEPLOY_COMPOSER_AUTH: ${{ secrets.DEPLOY_COMPOSER_AUTH }}
120120
- name: archive production artifacts
121-
uses: actions/upload-artifact@v3
121+
uses: actions/upload-artifact@v4
122122
with:
123123
name: deployment-build
124124
path: build/build.tgz
@@ -137,8 +137,8 @@ jobs:
137137
deploy:
138138
needs: build
139139
runs-on: ubuntu-latest
140-
# Here we use the latest Hypernode Deploy image with PHP 8.3 and Node.js 22
141-
container: quay.io/hypernode/deploy:latest-php8.3-node22
140+
# Here we use the latest Hypernode Deploy image with PHP 8.4 and Node.js 22
141+
container: quay.io/hypernode/deploy:latest-php8.4-node22
142142
steps:
143143
- uses: actions/checkout@v2
144144
- name: download build artifact

docs/hypernode-deploy/pipelines/bitbucket-pipelines.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Create the file `bitbucket-pipelines.yml` with the contents below.
5858
This workflow will be used in other workflows.
5959

6060
```yaml
61-
# Here we use the latest Hypernode Deploy image with PHP 8.3 and Node.js 22
62-
image: quay.io/hypernode/deploy:latest-php8.3-node22
61+
# Here we use the latest Hypernode Deploy image with PHP 8.4 and Node.js 22
62+
image: quay.io/hypernode/deploy:latest-php8.4-node22
6363

6464
definition:
6565
steps:
@@ -73,9 +73,9 @@ definition:
7373
7474
````{note}
7575
Don't forget to set the specifications of the image to what your project needs. The same goes for the deploy steps.
76-
For example, if your project needs PHP 8.3 and Node.js 22, set the image to:
76+
For example, if your project needs PHP 8.4 and Node.js 22, set the image to:
7777
```yaml
78-
image: quay.io/hypernode/deploy:latest-php8.3-node22
78+
image: quay.io/hypernode/deploy:latest-php8.4-node22
7979
```
8080
````
8181

docs/hypernode-deploy/pipelines/github-actions.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
build:
5959
runs-on: ubuntu-latest
6060
# See https://quay.io/repository/hypernode/deploy?tab=tags for all possible tags.
61-
container: quay.io/hypernode/deploy:latest-php8.3-node22
61+
container: quay.io/hypernode/deploy:latest-php8.4-node22
6262
steps:
6363
- uses: actions/checkout@v3
6464
- uses: actions/cache@v3
@@ -70,7 +70,7 @@ jobs:
7070
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
7171
- run: hypernode-deploy build -vvv
7272
- name: archive production artifacts
73-
uses: actions/upload-artifact@v3
73+
uses: actions/upload-artifact@v4
7474
with:
7575
name: deployment-build
7676
path: build/build.tgz
@@ -79,11 +79,11 @@ jobs:
7979
8080
````{note}
8181
Don't forget to set the specifications of the image to what your project needs. The same goes for the deploy steps.
82-
For example, if your project needs PHP 8.3 and Node.js 22, set the image to:
82+
For example, if your project needs PHP 8.4 and Node.js 22, set the image to:
8383
```yaml
8484
jobs:
8585
build:
86-
container: quay.io/hypernode/deploy:latest-php8.3-node22
86+
container: quay.io/hypernode/deploy:latest-php8.4-node22
8787
...
8888
```
8989
````
@@ -113,7 +113,7 @@ jobs:
113113
environment:
114114
name: production
115115
url: https://www.example.com
116-
container: quay.io/hypernode/deploy:latest-php8.3-node22
116+
container: quay.io/hypernode/deploy:latest-php8.4-node22
117117
steps:
118118
- uses: actions/checkout@v3
119119
- name: download build artifact
@@ -157,7 +157,7 @@ jobs:
157157
environment:
158158
name: acceptance
159159
url: https://acceptance.example.com
160-
container: quay.io/hypernode/deploy:latest-php8.3-node22
160+
container: quay.io/hypernode/deploy:latest-php8.4-node22
161161
steps:
162162
- uses: actions/checkout@v3
163163
- name: download build artifact

docs/hypernode-deploy/pipelines/gitlab-ci.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This sets the container image, defines the CI/CD stages and defines the build st
4949

5050
```yaml
5151
# See https://quay.io/repository/hypernode/deploy?tab=tags for all possible tags.
52-
image: quay.io/hypernode/deploy:latest-php8.3-node22
52+
image: quay.io/hypernode/deploy:latest-php8.4-node22
5353

5454
stages:
5555
- build
@@ -70,9 +70,9 @@ build:
7070
7171
````{note}
7272
Don't forget to set the specifications of the image to what your project needs.
73-
For example, if your project needs PHP 8.3 and Node.js 16, set the image to:
73+
For example, if your project needs PHP 8.4 and Node.js 16, set the image to:
7474
```yaml
75-
image: quay.io/hypernode/deploy:latest-php8.3-node16
75+
image: quay.io/hypernode/deploy:latest-php8.4-node16
7676
```
7777
````
7878

0 commit comments

Comments
 (0)