Skip to content

Commit 67101b6

Browse files
sineverbasineverba
authored
Merge pull request #90 from sineverba/release-1.7.0
Release 1.7.0
2 parents f025aa6 + e5d1871 commit 67101b6

File tree

6 files changed

+29
-22
lines changed

6 files changed

+29
-22
lines changed

‎.semaphore/build-deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ global_job_config:
2222
- name: DOCKER_IMAGE
2323
value: php74xc
2424
- name: BUILDX_VERSION
25-
value: 0.7.1
25+
value: 0.8.2
2626
- name: BINFMT_VERSION
27-
value: qemu-v6.2.0-25
27+
value: qemu-v6.2.0-26
2828

2929
blocks:
3030
- name: 'Build and deploy'

‎.semaphore/semaphore.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ blocks:
3030
commands:
3131
- checkout
3232
- docker build --tag $DOCKER_USERNAME/$DOCKER_IMAGE .
33-
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep 7.4.28
33+
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep 7.4.29
3434
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep OPcache
3535
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep xdebug
36-
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep "3.1.3"
36+
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep "3.1.4"
3737
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep pdo_pgsql
38-
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.25"
38+
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.26"
3939
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "short_open_tag => Off => Off"
4040
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "memory_limit => 512M => 512M"
4141

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
# 1.6.0
1+
# 1.7.0
2+
+ Upgrade dependencies + add mCrypt
3+
4+
## 1.6.0
25
+ Refactor Semaphore
36
+ Upgrade dependencies
47

‎Dockerfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.4.28-cli
1+
FROM php:7.4.29-cli
22

33
# OpCache settings
44
ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0"
@@ -8,6 +8,7 @@ ENV XDEBUG_MODE="debug,coverage"
88
RUN apt-get update -y && apt-get install -y \
99
git \
1010
curl \
11+
libmcrypt-dev \
1112
libpng-dev \
1213
libonig-dev \
1314
libxml2-dev \
@@ -20,14 +21,14 @@ RUN apt-get update -y && apt-get install -y \
2021
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
2122

2223
# Setup PHPXDebug
23-
RUN pecl install xdebug-3.1.3
24+
RUN pecl install xdebug-3.1.4 mcrypt-1.0.5
2425

2526
# Install PHP extensions
2627
RUN docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd opcache zip \
27-
&& docker-php-ext-enable mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd xdebug
28+
&& docker-php-ext-enable mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd xdebug mcrypt
2829

2930
# Get latest Composer
30-
COPY --from=composer:1.10.25 /usr/bin/composer /usr/bin/composer
31+
COPY --from=composer:1.10.26 /usr/bin/composer /usr/bin/composer
3132

3233
# Add custom ini files
3334
COPY config/10-shorttag.ini \

‎Makefile‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
IMAGE_NAME=sineverba/testphp74xc
22
CONTAINER_NAME=testphp74xc
3+
VERSION=1.7.0-dev
34

45
build:
5-
docker build --tag $(IMAGE_NAME) .
6+
docker build --tag $(IMAGE_NAME):$(VERSION) .
67

78
multiple:
89
docker buildx build --tag $(IMAGE_NAME) --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --push .
910

1011
test:
11-
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -v | grep 7.4.28
12-
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -v | grep OPcache
13-
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep xdebug
14-
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -r "xdebug_info();" | grep "3.1.3"
15-
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep pdo_pgsql
16-
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep zip
17-
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) /usr/bin/composer -V | grep "1.10.25"
18-
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -i | grep "short_open_tag => Off => Off"
19-
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -i | grep "memory_limit => 512M => 512M"
12+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -v | grep 7.4.29
13+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -v | grep OPcache
14+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -m | grep xdebug
15+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -r "xdebug_info();" | grep "3.1.4"
16+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -m | grep pdo_pgsql
17+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -m | grep zip
18+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -m | grep mcrypt
19+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) /usr/bin/composer -V | grep "1.10.26"
20+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -i | grep "short_open_tag => Off => Off"
21+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -i | grep "memory_limit => 512M => 512M"
2022

2123
destroy:
22-
docker image rm $(IMAGE_NAME)
24+
docker image rm $(IMAGE_NAME):$(VERSION)

‎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.28 | 1.10.25 | 3.1.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
24+
| latest | 7.4.29 | 1.10.26 | 3.1.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
25+
| 1.7.0 | 7.4.29 | 1.10.26 | 3.1.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2526
| 1.6.0 | 7.4.28 | 1.10.25 | 3.1.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2627
| 1.5.0 | 7.4.22 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2728
| 1.4.0 | 7.4.20 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |

0 commit comments

Comments
 (0)