Skip to content

Commit aa8d928

Browse files
authored
Merge pull request #71 from sineverba/release-1.1.0
Release 1.1.0
2 parents fdeebf7 + d501a94 commit aa8d928

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

.semaphore/semaphore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ blocks:
3333
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep xdebug
3434
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep "3.0.3"
3535
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep pdo_pgsql
36-
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.20"
36+
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.21"
3737
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "short_open_tag => Off => Off"
3838
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "memory_limit => 512M => 512M"
3939
secrets:

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
# 1.0.1
1+
# 1.1.0
2+
+ Bump composer to 1.10.21
3+
4+
## 1.0.1
25
+ Fix documentation
36

47
## 1.0.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bc
2727
&& docker-php-ext-enable mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd xdebug
2828

2929
# Get latest Composer
30-
COPY --from=composer:1.10.20 /usr/bin/composer /usr/bin/composer
30+
COPY --from=composer:1.10.21 /usr/bin/composer /usr/bin/composer
3131

3232
# Add custom ini files
3333
COPY config/10-shorttag.ini \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test:
1111
@docker run --rm sineverba/testphp74xc php -r "xdebug_info();" | grep "3.0.3"
1212
@docker run --rm sineverba/testphp74xc php -m | grep pdo_pgsql
1313
@docker run --rm sineverba/testphp74xc php -m | grep zip
14-
@docker run --rm sineverba/testphp74xc /usr/bin/composer -V | grep "1.10.20"
14+
@docker run --rm sineverba/testphp74xc /usr/bin/composer -V | grep "1.10.21"
1515
@docker run --rm sineverba/testphp74xc php -i | grep "short_open_tag => Off => Off"
1616
@docker run --rm sineverba/testphp74xc php -i | grep "memory_limit => 512M => 512M"
1717

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Do you use it? **Star it!**
2121

2222
| Github / Docker Image tag | PHP Version | Composer version | XDebug | Architectures |
2323
| ------------------------- | ----------- | ---------------- | ------ | ------------- |
24-
| latest | 7.4.16 | 1.10.20 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
24+
| latest | 7.4.16 | 1.10.21 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
25+
| 1.1.0 | 7.4.16 | 1.10.21 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2526
| 1.0.1 | 7.4.16 | 1.10.20 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2627
| 1.0.0 | 7.4.16 | 1.10.20 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2728

0 commit comments

Comments
 (0)