Skip to content

Commit f6d4ffd

Browse files
authored
Merge pull request #74 from sineverba/release-1.2.0
Release 1.2.0
2 parents aa8d928 + 84ffb2f commit f6d4ffd

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

.semaphore/semaphore.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ blocks:
3131
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep 7.4.16
3232
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep OPcache
3333
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep xdebug
34-
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep "3.0.3"
34+
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep "3.0.4"
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.21"
36+
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.22"
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.1.0
1+
# 1.2.0
2+
+ Upgrade `composer` and `Xdebug`
3+
4+
## 1.1.0
25
+ Bump composer to 1.10.21
36

47
## 1.0.1

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ RUN apt-get update && apt-get install -y \
2020
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
2121

2222
# Setup PHPXDebug
23-
RUN pecl install xdebug-3.0.3
23+
RUN pecl install xdebug-3.0.4
2424

2525
# Install PHP extensions
2626
RUN docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd opcache zip \
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.21 /usr/bin/composer /usr/bin/composer
30+
COPY --from=composer:1.10.22 /usr/bin/composer /usr/bin/composer
3131

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

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ test:
88
@docker run --rm sineverba/testphp74xc php -v | grep 7.4.16
99
@docker run --rm sineverba/testphp74xc php -v | grep OPcache
1010
@docker run --rm sineverba/testphp74xc php -m | grep xdebug
11-
@docker run --rm sineverba/testphp74xc php -r "xdebug_info();" | grep "3.0.3"
11+
@docker run --rm sineverba/testphp74xc php -r "xdebug_info();" | grep "3.0.4"
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.21"
14+
@docker run --rm sineverba/testphp74xc /usr/bin/composer -V | grep "1.10.22"
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.21 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
24+
| latest | 7.4.16 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
25+
| 1.2.0 | 7.4.16 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2526
| 1.1.0 | 7.4.16 | 1.10.21 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2627
| 1.0.1 | 7.4.16 | 1.10.20 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2728
| 1.0.0 | 7.4.16 | 1.10.20 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |

0 commit comments

Comments
 (0)