Skip to content

Commit

Permalink
Merge pull request #99 from sineverba/release-1.10.0
Browse files Browse the repository at this point in the history
Release 1.10.0
  • Loading branch information
sineverba authored Dec 4, 2023
2 parents 603bd18 + 73922fd commit d64e303
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .semaphore/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ global_job_config:
- name: DOCKER_IMAGE
value: php74xc
- name: BUILDX_VERSION
value: 0.11.1
value: 0.12.0
- name: BINFMT_VERSION
value: qemu-v7.0.0-28

Expand Down
2 changes: 1 addition & 1 deletion .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ blocks:
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep xdebug
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep "3.1.5"
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep pdo_pgsql
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.26"
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.27"
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "short_open_tag => Off => Off"
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "memory_limit => 512M => 512M"

Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# 1.9.0
# 1.10.0
+ Upgrade dependencies

## 1.9.0
+ Upgrade dependencies

## 1.8.0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bc
&& docker-php-ext-enable mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd xdebug mcrypt

# Get latest Composer
COPY --from=composer:1.10.26 /usr/bin/composer /usr/bin/composer
COPY --from=composer:1.10.27 /usr/bin/composer /usr/bin/composer

# Add custom ini files
COPY config/10-shorttag.ini \
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
IMAGE_NAME=sineverba/php74xc
CONTAINER_NAME=php74xc
APP_VERSION=1.9.0-dev
BUILDX_VERSION=0.11.1
APP_VERSION=1.10.0-dev
BUILDX_VERSION=0.12.0
BINFMT_VERSION=qemu-v7.0.0-28

build:
Expand Down Expand Up @@ -35,7 +35,7 @@ test:
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -m | grep pdo_pgsql
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -m | grep zip
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -m | grep mcrypt
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) /usr/bin/composer -V | grep "1.10.26"
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) /usr/bin/composer -V | grep "1.10.27"
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -i | grep "short_open_tag => Off => Off"
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -i | grep "memory_limit => 512M => 512M"

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
php74xc: Docker image for PHP7.4.x + Xdebug + Composer
======================================================

`docker pull sineverba/php74xc:latest`
`docker pull sineverba/php74xc:1.10.0`


| CD / CI | |
Expand All @@ -21,7 +21,8 @@ Do you use it? **Star it!**

| Github / Docker Image tag | PHP Version | Composer version | XDebug | Architectures |
| ------------------------- | ----------- | ---------------- | ------ | ------------- |
| latest | 7.4.33 | 1.10.26 | 3.1.5 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
| latest | 7.4.33 | 1.10.27 | 3.1.5 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
| 1.10.0 | 7.4.33 | 1.10.27 | 3.1.5 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
| 1.9.0 | 7.4.33 | 1.10.26 | 3.1.5 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
| 1.8.0 | 7.4.33 | 1.10.26 | 3.1.5 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
| 1.7.0 | 7.4.29 | 1.10.26 | 3.1.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
Expand Down

0 comments on commit d64e303

Please sign in to comment.