Skip to content

Commit

Permalink
MCLOUD-7989: No ARM images available for development on Macbook Pro M…
Browse files Browse the repository at this point in the history 
…1 CPU (#95)
  • Loading branch information
@BaDos
BaDos committed May 20, 2022
1 parent 8f4a804 commit 50c77b0
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 21 deletions.
7 changes: 6 additions & 1 deletion images/php/7.2-cli/Dockerfile
View file
Expand Up @@ -52,6 +52,10 @@ RUN apt-get update \
unzip \
vim \
openssh-client \
gnupg2 \
ca-certificates \
lsb-release \
software-properties-common \
libbz2-dev \
libjpeg62-turbo-dev \
libpng-dev \
Expand Down Expand Up @@ -143,7 +147,8 @@ RUN pecl install -o -f \
xdebug-3.1.2 \
yaml

RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
&& apt-get update \
&& apt-get install blackfire-php \
Expand Down
7 changes: 6 additions & 1 deletion images/php/7.2-fpm/Dockerfile
View file
Expand Up @@ -34,6 +34,10 @@ RUN apt-get update \
sudo \
iproute2 \
git \
gnupg2 \
ca-certificates \
lsb-release \
software-properties-common \
libbz2-dev \
libjpeg62-turbo-dev \
libpng-dev \
Expand Down Expand Up @@ -118,7 +122,8 @@ RUN pecl install -o -f \
xdebug-3.1.2 \
yaml

RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
&& apt-get update \
&& apt-get install blackfire-php \
Expand Down
7 changes: 6 additions & 1 deletion images/php/7.3-cli/Dockerfile
View file
Expand Up @@ -52,6 +52,10 @@ RUN apt-get update \
unzip \
vim \
openssh-client \
gnupg2 \
ca-certificates \
lsb-release \
software-properties-common \
libbz2-dev \
libjpeg62-turbo-dev \
libpng-dev \
Expand Down Expand Up @@ -140,7 +144,8 @@ RUN pecl install -o -f \
xdebug-3.1.2 \
yaml

RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
&& apt-get update \
&& apt-get install blackfire-php \
Expand Down
7 changes: 6 additions & 1 deletion images/php/7.3-fpm/Dockerfile
View file
Expand Up @@ -34,6 +34,10 @@ RUN apt-get update \
sudo \
iproute2 \
git \
gnupg2 \
ca-certificates \
lsb-release \
software-properties-common \
libbz2-dev \
libjpeg62-turbo-dev \
libpng-dev \
Expand Down Expand Up @@ -115,7 +119,8 @@ RUN pecl install -o -f \
xdebug-3.1.2 \
yaml

RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
&& apt-get update \
&& apt-get install blackfire-php \
Expand Down
7 changes: 6 additions & 1 deletion images/php/7.4-cli/Dockerfile
View file
Expand Up @@ -52,6 +52,10 @@ RUN apt-get update \
unzip \
vim \
openssh-client \
gnupg2 \
ca-certificates \
lsb-release \
software-properties-common \
libbz2-dev \
libjpeg62-turbo-dev \
libpng-dev \
Expand Down Expand Up @@ -130,7 +134,8 @@ RUN pecl install -o -f \
xdebug-3.1.2 \
yaml

RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
&& apt-get update \
&& apt-get install blackfire-php \
Expand Down
7 changes: 6 additions & 1 deletion images/php/7.4-fpm/Dockerfile
View file
Expand Up @@ -34,6 +34,10 @@ RUN apt-get update \
sudo \
iproute2 \
git \
gnupg2 \
ca-certificates \
lsb-release \
software-properties-common \
libbz2-dev \
libjpeg62-turbo-dev \
libpng-dev \
Expand Down Expand Up @@ -105,7 +109,8 @@ RUN pecl install -o -f \
xdebug-3.1.2 \
yaml

RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
&& apt-get update \
&& apt-get install blackfire-php \
Expand Down
7 changes: 6 additions & 1 deletion images/php/8.0-cli/Dockerfile
View file
Expand Up @@ -52,6 +52,10 @@ RUN apt-get update \
unzip \
vim \
openssh-client \
gnupg2 \
ca-certificates \
lsb-release \
software-properties-common \
libbz2-dev \
libjpeg62-turbo-dev \
libpng-dev \
Expand Down Expand Up @@ -123,7 +127,8 @@ RUN pecl install -o -f \
xmlrpc-1.0.0RC3 \
yaml

RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
&& apt-get update \
&& apt-get install blackfire-php \
Expand Down
7 changes: 6 additions & 1 deletion images/php/8.0-fpm/Dockerfile
View file
Expand Up @@ -34,6 +34,10 @@ RUN apt-get update \
sudo \
iproute2 \
git \
gnupg2 \
ca-certificates \
lsb-release \
software-properties-common \
libbz2-dev \
libjpeg62-turbo-dev \
libpng-dev \
Expand Down Expand Up @@ -98,7 +102,8 @@ RUN pecl install -o -f \
xmlrpc-1.0.0RC3 \
yaml

RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
&& apt-get update \
&& apt-get install blackfire-php \
Expand Down
14 changes: 1 addition & 13 deletions src/Compose/Php/ExtensionResolver.php
View file
Expand Up @@ -167,19 +167,7 @@ public static function getConfig(): array
'>=7.0' => [self::EXTENSION_TYPE => self::EXTENSION_TYPE_CORE],
],
'blackfire' => [
'>=7.2 <8.1' => [
self::EXTENSION_TYPE => self::EXTENSION_TYPE_INSTALLATION_SCRIPT,
// phpcs:disable
self::EXTENSION_INSTALLATION_SCRIPT => <<< BASH
curl -L https://packages.blackfire.io/gpg.key | apt-key add
echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list
apt-get update
apt-get install blackfire-php
rm -rf /var/lib/apt/lists/*
BASH
// phpcs:enable
],
'>=8.1' => [
'>=7.2' => [
self::EXTENSION_TYPE => self::EXTENSION_TYPE_INSTALLATION_SCRIPT,
self::EXTENSION_OS_DEPENDENCIES => [
'gnupg2',
Expand Down

0 comments on commit 50c77b0

Please sign in to comment.