From 7367b97dd9f5da0b8369d68ee9dd08e0d70f6f79 Mon Sep 17 00:00:00 2001
From: roquie <roquie0@gmail.com>
Date: Sun, 13 Nov 2022 12:24:24 +0300
Subject: [PATCH] Pre-commit 1.9.0 for release

---
 CHANGELOG.md                      | 27 ++++++++++
 Makefile                          |  2 +-
 README.md                         | 82 +++++++++++++++----------------
 base-xdebug/7.4/alpine.dockerfile |  2 +-
 base-xdebug/8.0/alpine.dockerfile |  2 +-
 base-xdebug/8.1/alpine.dockerfile |  2 +-
 base/7.4/alpine.dockerfile        |  2 +-
 base/8.0/alpine.dockerfile        |  2 +-
 base/8.1/alpine.dockerfile        | 14 +++---
 base74.mk                         |  4 +-
 base80.mk                         |  4 +-
 base81.mk                         |  4 +-
 spiral74.mk                       |  2 +-
 spiral80.mk                       |  2 +-
 spiral81.mk                       |  4 +-
 15 files changed, 92 insertions(+), 63 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b956648..5a3fe58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.9.0] - 2022-11-11
+
+### Added
+
+* `grpc` extension
+
+### Changed
+
+* Updated `rr` to `2.11.4`
+* Updated PHP 8.1.*
+
+### Deprecated
+
+*None*
+
+### Removed
+
+*None*
+
+### Fixed
+
+*None*
+
+### Security
+
+*None*
+
 ## [1.8.0] - 2022-01-19
 
 ### Added
diff --git a/Makefile b/Makefile
index 0cd465a..ad2663d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.8.0
+VERSION = 1.9.0
 PUSH = false
 
 include base74.mk
diff --git a/README.md b/README.md
index 5892177..4f75ef8 100644
--- a/README.md
+++ b/README.md
@@ -10,52 +10,52 @@ Docker image configured for <a href="https://roadrunner.dev/">roadrunner</a> in
 
 Simple image with PHP, RoadRunner and pre-installed extensions:
 
-* `spacetabio/roadrunner-alpine:7.4-base-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-base-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-base-1.8.0?style=flat-square)
-* `spacetabio/roadrunner-alpine:8.0-base-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-base-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-base-1.8.0?style=flat-square)
-* `spacetabio/roadrunner-alpine:8.1-base-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.1-base-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.1-base-1.8.0?style=flat-square)
-* `spacetabio/roadrunner-alpine:7.4-spiral-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-spiral-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-spiral-1.8.0?style=flat-square)
-* `spacetabio/roadrunner-alpine:8.0-spiral-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-spiral-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-spiral-1.8.0?style=flat-square)
-* `spacetabio/roadrunner-alpine:8.1-spiral-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.1-spiral-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.1-spiral-1.8.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:7.4-base-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-base-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-base-1.9.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:8.0-base-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-base-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-base-1.9.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:8.1-base-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.1-base-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.1-base-1.9.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:7.4-spiral-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-spiral-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-spiral-1.9.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:8.0-spiral-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-spiral-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-spiral-1.9.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:8.1-spiral-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.1-spiral-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.1-spiral-1.9.0?style=flat-square)
 
 With xdebug:
 
-* `spacetabio/roadrunner-alpine:7.4-base-xdebug-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-base-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-base-xdebug-1.8.0?style=flat-square)
-* `spacetabio/roadrunner-alpine:8.0-base-xdebug-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-base-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-base-xdebug-1.8.0?style=flat-square)
-* `spacetabio/roadrunner-alpine:8.1-base-xdebug-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.1-base-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.1-base-xdebug-1.8.0?style=flat-square)
-* `spacetabio/roadrunner-alpine:7.4-spiral-xdebug-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-spiral-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-spiral-xdebug-1.8.0?style=flat-square)
-* `spacetabio/roadrunner-alpine:8.0-spiral-xdebug-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-spiral-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-spiral-xdebug-1.8.0?style=flat-square)
-* `spacetabio/roadrunner-alpine:8.1-spiral-xdebug-1.8.0` <br>
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.1-spiral-1.8.0?style=flat-square)
-![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.1-spiral-xdebug-1.8.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:7.4-base-xdebug-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-base-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-base-xdebug-1.9.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:8.0-base-xdebug-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-base-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-base-xdebug-1.9.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:8.1-base-xdebug-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.1-base-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.1-base-xdebug-1.9.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:7.4-spiral-xdebug-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-spiral-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-spiral-xdebug-1.9.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:8.0-spiral-xdebug-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-spiral-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-spiral-xdebug-1.9.0?style=flat-square)
+* `spacetabio/roadrunner-alpine:8.1-spiral-xdebug-1.9.0` <br>
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.1-spiral-1.9.0?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.1-spiral-xdebug-1.9.0?style=flat-square)
 
 ## Basic usage
 
 Roadrunner:
 
 ```Dockerfile
-FROM spacetabio/roadrunner-alpine:8.1-base-1.8.0
+FROM spacetabio/roadrunner-alpine:8.1-base-1.9.0
 
 COPY . /app
 
@@ -66,7 +66,7 @@ CMD ["rr", "serve", "-c", ".rr.yaml"]
 Spiral Framework (<= v2.8):
 
 ```Dockerfile
-FROM spacetabio/roadrunner-alpine:8.1-spiral-1.8.0
+FROM spacetabio/roadrunner-alpine:8.1-spiral-1.9.0
 
 COPY . /app
 
@@ -126,15 +126,15 @@ ENV PHP_OPCACHE_FILE_CACHE_ONLY=1
 Format: `{phpVersion}-{imageType}-{semverImageVersion}`
 
 Map:
- - Image tag `*-1.8.0+` contains RoadRunner `2.7.3` and Spiral binary (in separate images).
+ - Image tag `*-1.9.0+` contains RoadRunner `2.7.3` and Spiral binary (in separate images).
  - Image tag `*-1.7.0+` contains RoadRunner `2.5.6` and Spiral binary (in separate images).
  - Image tag `*-1.6.0+` contains RoadRunner `2.4.2` and Spiral binary (in separate images).
  - Image tag `*-1.5.0+` contains RoadRunner `2.3.3` and Spiral binary (in separate images).
  - Image tag `*-1.4.0+` contains RoadRunner `2.3.3` and Spiral binary (in separate images).
  - Image tag `*-1.3.0` contains RoadRunner `2.3.3`.
  - Image tag `*-1.2.0` contains RoadRunner `1.8.1`. 
- - Image tag `*-1.1.0` contains RoadRunner `1.8.0`.
- - Image tag `*-1.0.0` contains RoadRunner `1.8.0`. 
+ - Image tag `*-1.1.0` contains RoadRunner `1.9.0`.
+ - Image tag `*-1.0.0` contains RoadRunner `1.9.0`. 
 
 ## Build and push to docker hub
 
diff --git a/base-xdebug/7.4/alpine.dockerfile b/base-xdebug/7.4/alpine.dockerfile
index fc5a863..630698a 100644
--- a/base-xdebug/7.4/alpine.dockerfile
+++ b/base-xdebug/7.4/alpine.dockerfile
@@ -13,7 +13,7 @@ RUN apk add --update --no-cache bash pcre icu yaml libuv libpq libpng libjpeg li
     && docker-php-ext-enable xdebug \
 	&& apk del build-dependencies
 
-ENV ROADRUNNER_VERSION=2.7.3
+ENV ROADRUNNER_VERSION=2.11.4
 RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
     && tar -xzf rr.tar.gz \
     && mv "roadrunner-${ROADRUNNER_VERSION}-linux-amd64/rr" /usr/local/bin/rr \
diff --git a/base-xdebug/8.0/alpine.dockerfile b/base-xdebug/8.0/alpine.dockerfile
index 03eee58..8fe32c4 100644
--- a/base-xdebug/8.0/alpine.dockerfile
+++ b/base-xdebug/8.0/alpine.dockerfile
@@ -13,7 +13,7 @@ RUN apk add --update --no-cache bash pcre icu yaml libpq libuv libpng libjpeg li
     && docker-php-ext-enable xdebug \
 	&& apk del build-dependencies
 
-ENV ROADRUNNER_VERSION=2.7.3
+ENV ROADRUNNER_VERSION=2.11.4
 RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
     && tar -xzf rr.tar.gz \
     && mv "roadrunner-${ROADRUNNER_VERSION}-linux-amd64/rr" /usr/local/bin/rr \
diff --git a/base-xdebug/8.1/alpine.dockerfile b/base-xdebug/8.1/alpine.dockerfile
index 769bc8e..35a7828 100644
--- a/base-xdebug/8.1/alpine.dockerfile
+++ b/base-xdebug/8.1/alpine.dockerfile
@@ -14,7 +14,7 @@ RUN apk add --update --no-cache bash pcre icu yaml libpq libuv libpng libjpeg li
 #    && pecl install yaml \
 #    && docker-php-ext-enable yaml \
 
-ENV ROADRUNNER_VERSION=2.7.3
+ENV ROADRUNNER_VERSION=2.11.4
 RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
     && tar -xzf rr.tar.gz \
     && mv "roadrunner-${ROADRUNNER_VERSION}-linux-amd64/rr" /usr/local/bin/rr \
diff --git a/base/7.4/alpine.dockerfile b/base/7.4/alpine.dockerfile
index d94ecbf..be329aa 100644
--- a/base/7.4/alpine.dockerfile
+++ b/base/7.4/alpine.dockerfile
@@ -11,7 +11,7 @@ RUN apk add --update --no-cache pcre icu yaml libuv libpq libpng libjpeg libexif
     && docker-php-ext-enable yaml \
 	&& apk del build-dependencies
 
-ENV ROADRUNNER_VERSION=2.7.3
+ENV ROADRUNNER_VERSION=2.11.4
 RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
     && tar -xzf rr.tar.gz \
     && mv "roadrunner-${ROADRUNNER_VERSION}-linux-amd64/rr" /usr/local/bin/rr \
diff --git a/base/8.0/alpine.dockerfile b/base/8.0/alpine.dockerfile
index a69220a..8385055 100644
--- a/base/8.0/alpine.dockerfile
+++ b/base/8.0/alpine.dockerfile
@@ -11,7 +11,7 @@ RUN apk add --update --no-cache pcre icu yaml libuv libpq libpng libjpeg libexif
     && docker-php-ext-enable yaml \
 	&& apk del build-dependencies
 
-ENV ROADRUNNER_VERSION=2.7.3
+ENV ROADRUNNER_VERSION=2.11.4
 RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
     && tar -xzf rr.tar.gz \
     && mv "roadrunner-${ROADRUNNER_VERSION}-linux-amd64/rr" /usr/local/bin/rr \
diff --git a/base/8.1/alpine.dockerfile b/base/8.1/alpine.dockerfile
index 2d510a7..a15c257 100644
--- a/base/8.1/alpine.dockerfile
+++ b/base/8.1/alpine.dockerfile
@@ -3,16 +3,18 @@ FROM php:8.1-cli-alpine AS build
 RUN apk add --update --no-cache pcre icu yaml libuv libpq libpng libjpeg libexif libzip freetype \
     && apk add --update --no-cache --virtual build-dependencies \
        autoconf g++ libtool pcre make icu-dev postgresql-dev \
-	   postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
+	   postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev \
+       libexif-dev libpng-dev libzip-dev ${PHPIZE_DEPS} \
 	&& docker-php-ext-configure gd --with-freetype --with-jpeg \
 	&& docker-php-ext-configure opcache --enable-opcache \
 	&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath \
-	&& apk del build-dependencies
+    && pecl install yaml \
+    && docker-php-ext-enable yaml \
+    && pecl install grpc \
+    && docker-php-ext-enable grpc \
+    && apk del build-dependencies ${PHPIZE_DEPS}
 
-#    && pecl install yaml \
-#    && docker-php-ext-enable yaml \
-
-ENV ROADRUNNER_VERSION=2.7.3
+ENV ROADRUNNER_VERSION=2.11.4
 RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
     && tar -xzf rr.tar.gz \
     && mv "roadrunner-${ROADRUNNER_VERSION}-linux-amd64/rr" /usr/local/bin/rr \
diff --git a/base74.mk b/base74.mk
index e77115e..869738c 100644
--- a/base74.mk
+++ b/base74.mk
@@ -1,13 +1,13 @@
 alpine-base74: NAME = spacetabio/roadrunner-alpine:7.4-base
 alpine-base74:
-	docker build -f "base/7.4/alpine.dockerfile" -t $(NAME)-$(VERSION) .
+	docker build --platform=linux/amd64 -f "base/7.4/alpine.dockerfile" -t $(NAME)-$(VERSION) .
 	@if [ "${PUSH}" == 'true' ]; then \
 	    docker push $(NAME)-$(VERSION) ; \
 	fi
 
 alpine-base-xdebug74: NAME = spacetabio/roadrunner-alpine:7.4-base-xdebug
 alpine-base-xdebug74:
-	docker build -f "base-xdebug/7.4/alpine.dockerfile" -t $(NAME)-$(VERSION) .
+	docker build --platform=linux/amd64  -f "base-xdebug/7.4/alpine.dockerfile" -t $(NAME)-$(VERSION) .
 	@if [ "${PUSH}" == 'true' ]; then \
 	    docker push $(NAME)-$(VERSION) ; \
 	fi
diff --git a/base80.mk b/base80.mk
index 5a03a95..49f8fcd 100644
--- a/base80.mk
+++ b/base80.mk
@@ -1,13 +1,13 @@
 alpine-base80: NAME = spacetabio/roadrunner-alpine:8.0-base
 alpine-base80:
-	docker build -f "base/8.0/alpine.dockerfile" -t $(NAME)-$(VERSION) .
+	docker build --platform=linux/amd64 -f "base/8.0/alpine.dockerfile" -t $(NAME)-$(VERSION) .
 	@if [ "${PUSH}" == 'true' ]; then \
 	    docker push $(NAME)-$(VERSION) ; \
 	fi
 
 alpine-base-xdebug80: NAME = spacetabio/roadrunner-alpine:8.0-base-xdebug
 alpine-base-xdebug80:
-	docker build -f "base-xdebug/8.0/alpine.dockerfile" -t $(NAME)-$(VERSION) .
+	docker build --platform=linux/amd64 -f "base-xdebug/8.0/alpine.dockerfile" -t $(NAME)-$(VERSION) .
 	@if [ "${PUSH}" == 'true' ]; then \
 	    docker push $(NAME)-$(VERSION) ; \
 	fi
diff --git a/base81.mk b/base81.mk
index fdb5c2d..cd1e3f1 100644
--- a/base81.mk
+++ b/base81.mk
@@ -1,13 +1,13 @@
 alpine-base81: NAME = spacetabio/roadrunner-alpine:8.1-base
 alpine-base81:
-	docker build -f "base/8.1/alpine.dockerfile" -t $(NAME)-$(VERSION) .
+	docker build --platform=linux/amd64 -f "base/8.1/alpine.dockerfile" -t $(NAME)-$(VERSION) .
 	@if [ "${PUSH}" == 'true' ]; then \
 	    docker push $(NAME)-$(VERSION) ; \
 	fi
 
 alpine-base-xdebug81: NAME = spacetabio/roadrunner-alpine:8.1-base-xdebug
 alpine-base-xdebug81:
-	docker build -f "base-xdebug/8.1/alpine.dockerfile" -t $(NAME)-$(VERSION) .
+	docker build --platform=linux/amd64 -f "base-xdebug/8.1/alpine.dockerfile" -t $(NAME)-$(VERSION) .
 	@if [ "${PUSH}" == 'true' ]; then \
 	    docker push $(NAME)-$(VERSION) ; \
 	fi
diff --git a/spiral74.mk b/spiral74.mk
index 797ddb9..88ff351 100644
--- a/spiral74.mk
+++ b/spiral74.mk
@@ -1,6 +1,6 @@
 alpine-spiral74: NAME = spacetabio/roadrunner-alpine:7.4-spiral
 alpine-spiral74:
-	docker build -f "spiral/7.4/alpine.dockerfile" -t $(NAME)-$(VERSION) .
+	docker build --platform=linux/amd64 -f "spiral/7.4/alpine.dockerfile" -t $(NAME)-$(VERSION) .
 	@if [ "${PUSH}" == 'true' ]; then \
 	    docker push $(NAME)-$(VERSION) ; \
 	fi
diff --git a/spiral80.mk b/spiral80.mk
index ea05f7b..b28f3cc 100644
--- a/spiral80.mk
+++ b/spiral80.mk
@@ -1,6 +1,6 @@
 alpine-spiral80: NAME = spacetabio/roadrunner-alpine:8.0-spiral
 alpine-spiral80:
-	docker build -f "spiral/8.0/alpine.dockerfile" -t $(NAME)-$(VERSION) .
+	docker build --platform=linux/amd64 -f "spiral/8.0/alpine.dockerfile" -t $(NAME)-$(VERSION) .
 	@if [ "${PUSH}" == 'true' ]; then \
 	    docker push $(NAME)-$(VERSION) ; \
 	fi
diff --git a/spiral81.mk b/spiral81.mk
index 0e83e13..63ef483 100644
--- a/spiral81.mk
+++ b/spiral81.mk
@@ -1,13 +1,13 @@
 alpine-spiral81: NAME = spacetabio/roadrunner-alpine:8.1-spiral
 alpine-spiral81:
-	docker build -f "spiral/8.1/alpine.dockerfile" -t $(NAME)-$(VERSION) .
+	docker build --platform=linux/amd64 -f "spiral/8.1/alpine.dockerfile" -t $(NAME)-$(VERSION) .
 	@if [ "${PUSH}" == 'true' ]; then \
 	    docker push $(NAME)-$(VERSION) ; \
 	fi
 
 alpine-spiral-xdebug81: NAME = spacetabio/roadrunner-alpine:8.1-spiral-xdebug
 alpine-spiral-xdebug81:
-	docker build -f "spiral-xdebug/8.1/alpine.dockerfile" -t $(NAME)-$(VERSION) .
+	docker build --platform=linux/amd64 -f "spiral-xdebug/8.1/alpine.dockerfile" -t $(NAME)-$(VERSION) .
 	@if [ "${PUSH}" == 'true' ]; then \
 	    docker push $(NAME)-$(VERSION) ; \
 	fi