Merge pull request #92 from sineverba/upgrade-dependencies

Upgrade dependencies

Author: sineverba

.semaphore/build-deploy.yml

@@ -22,9 +22,9 @@ global_job_config:
     - name: DOCKER_IMAGE
       value: php74xc
     - name: BUILDX_VERSION
-      value: 0.8.2
+      value: 0.10.0
     - name: BINFMT_VERSION
-      value: qemu-v6.2.0-26
+      value: qemu-v7.0.0-28
 
 blocks:
   - name: 'Build and deploy'

.semaphore/semaphore.yml

@@ -30,10 +30,10 @@ blocks:
           commands:
             - checkout
             - docker build --tag $DOCKER_USERNAME/$DOCKER_IMAGE .
-            - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep 7.4.29
+            - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep 7.4.33
             - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep OPcache
             - 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.4"
+            - 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 php -i | grep "short_open_tag => Off => Off"

CHANGELOG.md

@@ -1,4 +1,7 @@
-# 1.7.0
+# Next version
++ Upgrade dependencies
+
+## 1.7.0
 + Upgrade dependencies + add mCrypt
 
 ## 1.6.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4.29-cli
+FROM php:7.4.33-cli
 
 # OpCache settings
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0"
@@ -21,7 +21,7 @@ RUN apt-get update -y && apt-get install -y \
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Setup PHPXDebug
-RUN pecl install xdebug-3.1.4 mcrypt-1.0.5
+RUN pecl install xdebug-3.1.5 mcrypt-1.0.5
 
 # Install PHP extensions
 RUN docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd opcache zip \

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2020 - 2022 sineverba
+Copyright (c) 2020 - 2023 sineverba
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,24 +1,37 @@
-IMAGE_NAME=sineverba/testphp74xc
-CONTAINER_NAME=testphp74xc
-VERSION=1.7.0-dev
+IMAGE_NAME=sineverba/php74xc
+CONTAINER_NAME=php74xc
+APP_VERSION=1.7.0-dev
+BUILDX_VERSION=0.10.0
+BINFMT_VERSION=qemu-v7.0.0-28
 
 build:
-		docker build --tag $(IMAGE_NAME):$(VERSION) .
+	docker build --tag $(IMAGE_NAME):$(APP_VERSION) .
 
-multiple:
-		docker buildx build --tag $(IMAGE_NAME) --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --push .
+preparemulti:
+	mkdir -vp ~/.docker/cli-plugins
+	curl -L "https://github.com/docker/buildx/releases/download/v$(BUILDX_VERSION)/buildx-v$(BUILDX_VERSION).linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+	chmod a+x ~/.docker/cli-plugins/docker-buildx
+	docker buildx version
+	docker run --rm --privileged tonistiigi/binfmt:$(BINFMT_VERSION) --install all
+	docker buildx ls
+	docker buildx rm multiarch
+	docker buildx create --name multiarch --driver docker-container --use
+	
+multi:
+	docker buildx inspect --bootstrap --builder multiarch
+	docker buildx build --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7 --tag $(IMAGE_NAME):$(APP_VERSION) --tag $(IMAGE_NAME):latest .
 
 test:
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -v | grep 7.4.29
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -v | grep OPcache
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -m | grep xdebug
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -r "xdebug_info();" | grep "3.1.4"
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -m | grep pdo_pgsql
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -m | grep zip
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -m | grep mcrypt
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) /usr/bin/composer -V | grep "1.10.26"
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -i | grep "short_open_tag => Off => Off"
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(VERSION) php -i | grep "memory_limit => 512M => 512M"
+	@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -v | grep 7.4.33
+	@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -v | grep OPcache
+	@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -m | grep xdebug
+	@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -r "xdebug_info();" | grep "3.1.5"
+	@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) 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"
 
 destroy:
-		docker image rm $(IMAGE_NAME):$(VERSION)
+	docker image rm $(IMAGE_NAME):$(APP_VERSION)

README.md

@@ -21,7 +21,7 @@ Do you use it? **Star it!**
 
 | Github / Docker Image tag | PHP Version | Composer version | XDebug | Architectures |
 | ------------------------- | ----------- | ---------------- | ------ | ------------- |
-| latest | 7.4.29 | 1.10.26 | 3.1.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
+| latest | 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 |
 | 1.6.0 | 7.4.28 | 1.10.25 | 3.1.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
 | 1.5.0 | 7.4.22 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |