Skip to content

Commit cc26fc5

Browse files
committed
Update to latest IM7 version.
1 parent 2fbe4a7 commit cc26fc5

File tree

7 files changed

+38
-35
lines changed

7 files changed

+38
-35
lines changed

containers/imagick_php_base_im7/install_imagemagick.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
version="7.1.0-13"
3+
version="7.1.0-17"
44
# version="7.0.7-11"
55

66
im_tgz_file="ImageMagick-${version}.tar.gz"

containers/installer/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ RUN apt-get update -qq \
2222
# Make the default directory you
2323
WORKDIR /var/app
2424

25-
#CMD tail -f README.md
25+
CMD php -v
2626

27-
CMD sh /var/app/containers/installer/entrypoint.sh
27+
# CMD tail -f README.md
28+
29+
# CMD sh /var/app/containers/installer/entrypoint.sh

docker-compose.override.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ services:
99
installer:
1010
environment:
1111
- ENV_DESCRIPTION=default,local
12-
redis:
13-
ports:
14-
- "6379:6379"
12+
# redis:
13+
# ports:
14+
# - "6379:6379"
1515
js_builder:
1616
environment:
1717
- API_BASE_URL=http://local.phpimagick.com

package-lock.json

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"homepage": "https://github.com/Danack/Imagick-demos#readme",
3030
"devDependencies": {
31-
"@types/jquery": "^3.5.8",
31+
"@types/jquery": "^3.5.10",
3232
"compression-webpack-plugin": "^3.1.0",
3333
"css-loader": "^3.6.0",
3434
"raw-loader": "^4.0.2",
@@ -45,10 +45,10 @@
4545
"dependencies": {
4646
"argv": "0.0.2",
4747
"command-line-args": "^5.1.1",
48-
"preact": "^10.5.15",
48+
"preact": "^10.6.3",
4949
"promise-polyfill": "^8.2.1",
50-
"rc-slider": "^9.7.4",
51-
"react-colorful": "^5.2.2",
50+
"rc-slider": "^9.7.5",
51+
"react-colorful": "^5.5.1",
5252
"react-dropdown": "^1.9.2",
5353
"react-input-range": "^1.3.0"
5454
},

runLocal.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
set -e
44
set -x
55

6-
docker-compose build --no-cache imagick_php_base_im7
7-
docker-compose build --no-cache imagick_php_base_im6
6+
docker-compose build imagick_php_base_im6
7+
docker-compose build imagick_php_base_im7
88

99
docker-compose up --build --remove-orphans installer
1010

1111
docker-compose up --build imagick_php_backend_im6 imagick_php_backend_im6_debug imagick_php_backend_im7 imagick_php_backend_im7_debug js_builder redis nginx chrome_headless
1212

1313
# workers
1414

15+
# docker-compose up --build installer

src/ImagickDemo/Params/Amplitude.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use Params\ExtractRule\GetFloatOrDefault;
66
use Params\InputParameter;
77
use Params\Param;
8-
use Params\ProcessRule\MaxIntValue;
9-
use Params\ProcessRule\MinIntValue;
8+
use Params\ProcessRule\MaxFloatValue;
9+
use Params\ProcessRule\MinFloatValue;
1010

1111
#[\Attribute]
1212
class Amplitude implements Param
@@ -21,8 +21,8 @@ public function getInputParameter(): InputParameter
2121
return new InputParameter(
2222
$this->name,
2323
new GetFloatOrDefault(5),
24-
new MinIntValue(0),
25-
new MaxIntValue(20),
24+
new MinFloatValue(0),
25+
new MaxFloatValue(20),
2626
);
2727
}
2828
}

0 commit comments

Comments
 (0)