Upgrade dependencies

Author: Alessandro Arici

.semaphore/build-deploy.yml

@@ -21,6 +21,10 @@ global_job_config:
       value: sineverba
     - name: DOCKER_IMAGE
       value: php74xc
+    - name: BUILDX_VERSION
+      value: 0.7.1
+    - name: BINFMT_VERSION
+      value: qemu-v6.2.0-25
 
 blocks:
   - name: 'Build and deploy'
@@ -29,11 +33,12 @@ blocks:
         - name: 'Build and deploy'
           commands:
             - checkout
-            - docker -v
             - mkdir -vp ~/.docker/cli-plugins/
-            - curl --silent -L "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+            - curl --silent -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 multiarch/qemu-user-static --reset -p yes
-            - docker buildx create --name mybuilder && docker buildx use mybuilder && docker buildx inspect --bootstrap
-            - docker buildx build --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --tag $DOCKER_USERNAME/$DOCKER_IMAGE:$SEMAPHORE_GIT_TAG_NAME --tag $DOCKER_USERNAME/$DOCKER_IMAGE:latest --push .
+            - docker run --rm --privileged tonistiigi/binfmt:$BINFMT_VERSION --install all
+            - docker buildx ls
+            - docker buildx create --name multiarch --driver docker-container --use
+            - docker buildx inspect --bootstrap --builder multiarch
+            - docker buildx build --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7 --tag $DOCKER_USERNAME/$DOCKER_IMAGE:$SEMAPHORE_GIT_TAG_NAME --tag $DOCKER_USERNAME/$DOCKER_IMAGE:latest --push .

.semaphore/semaphore.yml

@@ -30,12 +30,12 @@ blocks:
           commands:
             - checkout
             - docker build --tag $DOCKER_USERNAME/$DOCKER_IMAGE .
-            - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep 7.4.22
+            - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep 7.4.28
             - 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.0.4"
+            - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep "3.1.3"
             - 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.22"
+            - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.25"
             - 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"
 

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Next version
 + Refactor Semaphore
++ Upgrade dependencies
 
 ## 1.5.0
 + Upgrade PHP to 7.4.22

Dockerfile

@@ -1,11 +1,11 @@
-FROM php:7.4.22-cli
+FROM php:7.4.28-cli
 
 # OpCache settings
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0"
 ENV XDEBUG_MODE="debug,coverage"
 
 # Install system dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt-get update -y && apt-get install -y \
     git \
     curl \
     libpng-dev \
@@ -20,14 +20,14 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Setup PHPXDebug
-RUN pecl install xdebug-3.0.4
+RUN pecl install xdebug-3.1.3
 
 # Install PHP extensions
 RUN docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd opcache zip \
     && docker-php-ext-enable mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd xdebug
 
 # Get latest Composer
-COPY --from=composer:1.10.22 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:1.10.25 /usr/bin/composer /usr/bin/composer
 
 # Add custom ini files
 COPY config/10-shorttag.ini \

Makefile

@@ -8,13 +8,13 @@ multiple:
 		docker buildx build --tag $(IMAGE_NAME) --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --push .
 
 test:
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -v | grep 7.4.22
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -v | grep 7.4.28
 		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -v | grep OPcache
 		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep xdebug
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -r "xdebug_info();" | grep "3.0.4"
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -r "xdebug_info();" | grep "3.1.3"
 		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep pdo_pgsql
 		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep zip
-		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) /usr/bin/composer -V | grep "1.10.22"
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) /usr/bin/composer -V | grep "1.10.25"
 		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -i | grep "short_open_tag => Off => Off"
 		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -i | grep "memory_limit => 512M => 512M"
 

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.22 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
+| latest | 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 |
 | 1.4.0 | 7.4.20 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
 | 1.3.0 | 7.4.19 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |