Skip to content

Commit f246b7d

Browse files
committed
release Drip Connect 2.0.7
1 parent 6664cfd commit f246b7d

File tree

8 files changed

+149
-8
lines changed

8 files changed

+149
-8
lines changed

devtools_m2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ EXPOSE 80
2626
RUN mkdir -p /var/www/html/magento
2727
RUN chown -R www-data:www-data /var/www/html/magento
2828
USER www-data
29-
RUN git clone --depth 1 --branch 2.4.5 https://github.com/magento/magento2.git /var/www/html/magento
29+
RUN git clone --depth 1 --branch 2.4.7 https://github.com/magento/magento2.git /var/www/html/magento
3030
# RUN cd /var/www/html/magento && patch -p1 < /magento_2.4.4_js_const.patch
3131
RUN cd /var/www/html/magento && composer install
3232

devtools_m2/cypress/integration/RestApi/steps.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ Then('an authorized status request gives the correct response', function(site) {
121121
const body = response.body
122122
expect(body["account_param"]).to.eq('123456')
123123
expect(body["integration_token"]).to.eq('abcdefg')
124-
expect(body["magento_version"]).to.eq("2.4.5")
125-
expect(body["plugin_version"]).to.eq("2.0.6")
124+
expect(body["magento_version"]).to.eq("2.4.7")
125+
expect(body["plugin_version"]).to.eq("2.0.7")
126126
})
127127
})
128128
})

devtools_m2/devbox.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.12.0/.schema/devbox.schema.json",
3+
"packages": [
4+
"php83Packages.composer@latest",
5+
6+
],
7+
"shell": {
8+
"init_hook": [
9+
"echo 'Welcome to devbox!' > /dev/null"
10+
],
11+
"scripts": {
12+
"test": [
13+
"echo \"Error: no test specified\" && exit 1"
14+
]
15+
}
16+
}
17+
}

devtools_m2/devbox.lock

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
{
2+
"lockfile_version": "1",
3+
"packages": {
4+
"php83Packages.composer@latest": {
5+
"last_modified": "2024-11-16T04:25:12Z",
6+
"resolved": "github:NixOS/nixpkgs/34a626458d686f1b58139620a8b2793e9e123bba#php83Packages.composer",
7+
"source": "devbox-search",
8+
"version": "2.8.1",
9+
"systems": {
10+
"aarch64-darwin": {
11+
"outputs": [
12+
{
13+
"name": "out",
14+
"path": "/nix/store/z783rbfic7sqiaa0dz6zkjsy3k40znj8-composer-2.8.1",
15+
"default": true
16+
}
17+
],
18+
"store_path": "/nix/store/z783rbfic7sqiaa0dz6zkjsy3k40znj8-composer-2.8.1"
19+
},
20+
"aarch64-linux": {
21+
"outputs": [
22+
{
23+
"name": "out",
24+
"path": "/nix/store/46wg2d3b494y8a8avmjrhhxknzm2zkhv-composer-2.8.1",
25+
"default": true
26+
}
27+
],
28+
"store_path": "/nix/store/46wg2d3b494y8a8avmjrhhxknzm2zkhv-composer-2.8.1"
29+
},
30+
"x86_64-darwin": {
31+
"outputs": [
32+
{
33+
"name": "out",
34+
"path": "/nix/store/rcvpzas98yxdggx26016p06xlfww8rqx-composer-2.8.1",
35+
"default": true
36+
}
37+
],
38+
"store_path": "/nix/store/rcvpzas98yxdggx26016p06xlfww8rqx-composer-2.8.1"
39+
},
40+
"x86_64-linux": {
41+
"outputs": [
42+
{
43+
"name": "out",
44+
"path": "/nix/store/9wbyqqf173agra3f2gw11b5jcl4dzswq-composer-2.8.1",
45+
"default": true
46+
}
47+
],
48+
"store_path": "/nix/store/9wbyqqf173agra3f2gw11b5jcl4dzswq-composer-2.8.1"
49+
}
50+
}
51+
},
52+
53+
"last_modified": "2024-11-16T04:25:12Z",
54+
"plugin_version": "0.0.3",
55+
"resolved": "github:NixOS/nixpkgs/34a626458d686f1b58139620a8b2793e9e123bba#php83",
56+
"source": "devbox-search",
57+
"version": "8.3.13",
58+
"systems": {
59+
"aarch64-darwin": {
60+
"outputs": [
61+
{
62+
"name": "out",
63+
"path": "/nix/store/mfhciqlprywca7n71mwfxwczk10jdxa0-php-with-extensions-8.3.13",
64+
"default": true
65+
}
66+
],
67+
"store_path": "/nix/store/mfhciqlprywca7n71mwfxwczk10jdxa0-php-with-extensions-8.3.13"
68+
},
69+
"aarch64-linux": {
70+
"outputs": [
71+
{
72+
"name": "out",
73+
"path": "/nix/store/sd2d5fizi6kvfg49gk7ik3f5f88731z2-php-with-extensions-8.3.13",
74+
"default": true
75+
}
76+
],
77+
"store_path": "/nix/store/sd2d5fizi6kvfg49gk7ik3f5f88731z2-php-with-extensions-8.3.13"
78+
},
79+
"x86_64-darwin": {
80+
"outputs": [
81+
{
82+
"name": "out",
83+
"path": "/nix/store/svll1a64506chpjlsgj50hx8gw5j3b8b-php-with-extensions-8.3.13",
84+
"default": true
85+
}
86+
],
87+
"store_path": "/nix/store/svll1a64506chpjlsgj50hx8gw5j3b8b-php-with-extensions-8.3.13"
88+
},
89+
"x86_64-linux": {
90+
"outputs": [
91+
{
92+
"name": "out",
93+
"path": "/nix/store/r3lgaz85f2p8bvkx7z3d2qi1z4b1dn7k-php-with-extensions-8.3.13",
94+
"default": true
95+
}
96+
],
97+
"store_path": "/nix/store/r3lgaz85f2p8bvkx7z3d2qi1z4b1dn7k-php-with-extensions-8.3.13"
98+
}
99+
}
100+
}
101+
}
102+
}

devtools_m2/docker-compose.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.7'
1+
name: magento2.4.7
22
services:
33
web:
44
build: .
@@ -23,12 +23,15 @@ services:
2323
consistency: cached
2424
db:
2525
image: mariadb:10.4
26+
ports:
27+
- 3306:3306
2628
environment:
2729
- MARIADB_DATABASE=magento
2830
- MARIADB_USER=magento
2931
- MARIADB_PASSWORD=magento
3032
- MARIADB_RANDOM_ROOT_PASSWORD=true
31-
tmpfs: /var/lib/mysql
33+
volumes:
34+
- ./db_data/mysql:/var/lib/mysql
3235
opensearch:
3336
image: opensearchproject/opensearch:1.2.4
3437
environment:

devtools_m2/php_utils/Console/Command/CreateProductCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
9292
$factory = $this->virtualProductCreatorFactory;
9393
break;
9494
default:
95-
throw new \UnexpectedValueException("Unsupported type: ${type}");
95+
throw new \UnexpectedValueException("Unsupported type: {$type}");
9696
}
9797

9898
$factory->create(['productData' => $json])->create();

devtools_m2/readme.md

+17
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,20 @@ Then run `setup.sh` to bring a clean instance back up.
4848
## To run cron
4949

5050
Run the `cron.sh` script in the `devtools_m2/` directory.
51+
52+
## Troubleshooting
53+
54+
When code or configuration changes are made, flush M2 cache with:
55+
```sh
56+
bin/magento cache:flush
57+
```
58+
59+
When getting `ReflectionException: Class "Magento\Framework\App\Http\Interceptor" does not exist`, run:
60+
```sh
61+
bin/magento setup:di:compile
62+
```
63+
64+
When updating catalog you will need to perform a reindex if the following error is throwed: `Elasticsearch No mapping found for...`
65+
```sh
66+
bin/magento indexer:reindex
67+
```

devtools_m2/setup.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ MAGE_MODE=developer ./bin/magento setup:install \
3636
--db-name=magento \
3737
--db-user=magento \
3838
--db-password=magento \
39+
--search-engine=elasticsearch7 \
3940
--elasticsearch-host=opensearch \
4041
--elasticsearch-username=admin \
4142
--elasticsearch-password=admin \
@@ -57,8 +58,9 @@ MAGE_MODE=developer ./bin/magento setup:install \
5758
./bin/magento config:set dev/css/merge_css_files 1 && \
5859
./bin/magento config:set dev/css/minify_files 1 && \
5960
./bin/magento config:set dripconnect_general/log_settings/is_enabled 1 && \
60-
./bin/magento setup:static-content:deploy -f && \
61-
./bin/magento deploy:mode:set production
61+
./bin/magento setup:upgrade && \
62+
./bin/magento deploy:mode:set production && \
63+
./bin/magento setup:static-content:deploy
6264
SCRIPT
6365
)
6466

0 commit comments

Comments
 (0)