Skip to content

Commit 50c77b0

Browse files
BaDosBaDos
authored
MCLOUD-7989: No ARM images available for development on Macbook Pro M1 CPU (#95)
1 parent 8f4a804 commit 50c77b0

File tree

9 files changed

+49
-21
lines changed

9 files changed

+49
-21
lines changed

‎images/php/7.2-cli/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ RUN apt-get update \
5252
unzip \
5353
vim \
5454
openssh-client \
55+
gnupg2 \
56+
ca-certificates \
57+
lsb-release \
58+
software-properties-common \
5559
libbz2-dev \
5660
libjpeg62-turbo-dev \
5761
libpng-dev \
@@ -143,7 +147,8 @@ RUN pecl install -o -f \
143147
xdebug-3.1.2 \
144148
yaml
145149

146-
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
150+
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
151+
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
147152
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
148153
&& apt-get update \
149154
&& apt-get install blackfire-php \

‎images/php/7.2-fpm/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ RUN apt-get update \
3434
sudo \
3535
iproute2 \
3636
git \
37+
gnupg2 \
38+
ca-certificates \
39+
lsb-release \
40+
software-properties-common \
3741
libbz2-dev \
3842
libjpeg62-turbo-dev \
3943
libpng-dev \
@@ -118,7 +122,8 @@ RUN pecl install -o -f \
118122
xdebug-3.1.2 \
119123
yaml
120124

121-
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
125+
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
126+
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
122127
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
123128
&& apt-get update \
124129
&& apt-get install blackfire-php \

‎images/php/7.3-cli/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ RUN apt-get update \
5252
unzip \
5353
vim \
5454
openssh-client \
55+
gnupg2 \
56+
ca-certificates \
57+
lsb-release \
58+
software-properties-common \
5559
libbz2-dev \
5660
libjpeg62-turbo-dev \
5761
libpng-dev \
@@ -140,7 +144,8 @@ RUN pecl install -o -f \
140144
xdebug-3.1.2 \
141145
yaml
142146

143-
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
147+
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
148+
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
144149
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
145150
&& apt-get update \
146151
&& apt-get install blackfire-php \

‎images/php/7.3-fpm/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ RUN apt-get update \
3434
sudo \
3535
iproute2 \
3636
git \
37+
gnupg2 \
38+
ca-certificates \
39+
lsb-release \
40+
software-properties-common \
3741
libbz2-dev \
3842
libjpeg62-turbo-dev \
3943
libpng-dev \
@@ -115,7 +119,8 @@ RUN pecl install -o -f \
115119
xdebug-3.1.2 \
116120
yaml
117121

118-
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
122+
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
123+
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
119124
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
120125
&& apt-get update \
121126
&& apt-get install blackfire-php \

‎images/php/7.4-cli/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ RUN apt-get update \
5252
unzip \
5353
vim \
5454
openssh-client \
55+
gnupg2 \
56+
ca-certificates \
57+
lsb-release \
58+
software-properties-common \
5559
libbz2-dev \
5660
libjpeg62-turbo-dev \
5761
libpng-dev \
@@ -130,7 +134,8 @@ RUN pecl install -o -f \
130134
xdebug-3.1.2 \
131135
yaml
132136

133-
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
137+
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
138+
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
134139
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
135140
&& apt-get update \
136141
&& apt-get install blackfire-php \

‎images/php/7.4-fpm/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ RUN apt-get update \
3434
sudo \
3535
iproute2 \
3636
git \
37+
gnupg2 \
38+
ca-certificates \
39+
lsb-release \
40+
software-properties-common \
3741
libbz2-dev \
3842
libjpeg62-turbo-dev \
3943
libpng-dev \
@@ -105,7 +109,8 @@ RUN pecl install -o -f \
105109
xdebug-3.1.2 \
106110
yaml
107111

108-
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
112+
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
113+
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
109114
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
110115
&& apt-get update \
111116
&& apt-get install blackfire-php \

‎images/php/8.0-cli/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ RUN apt-get update \
5252
unzip \
5353
vim \
5454
openssh-client \
55+
gnupg2 \
56+
ca-certificates \
57+
lsb-release \
58+
software-properties-common \
5559
libbz2-dev \
5660
libjpeg62-turbo-dev \
5761
libpng-dev \
@@ -123,7 +127,8 @@ RUN pecl install -o -f \
123127
xmlrpc-1.0.0RC3 \
124128
yaml
125129

126-
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
130+
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
131+
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
127132
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
128133
&& apt-get update \
129134
&& apt-get install blackfire-php \

‎images/php/8.0-fpm/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ RUN apt-get update \
3434
sudo \
3535
iproute2 \
3636
git \
37+
gnupg2 \
38+
ca-certificates \
39+
lsb-release \
40+
software-properties-common \
3741
libbz2-dev \
3842
libjpeg62-turbo-dev \
3943
libpng-dev \
@@ -98,7 +102,8 @@ RUN pecl install -o -f \
98102
xmlrpc-1.0.0RC3 \
99103
yaml
100104

101-
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
105+
RUN curl -L https://packages.blackfire.io/gpg.key | gpg --dearmor > blackfire.io-archive-keyring.gpg \
106+
&& install -o root -g root -m 644 blackfire.io-archive-keyring.gpg /etc/apt/trusted.gpg.d/ \
102107
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
103108
&& apt-get update \
104109
&& apt-get install blackfire-php \

‎src/Compose/Php/ExtensionResolver.php

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -167,19 +167,7 @@ public static function getConfig(): array
167167
'>=7.0' => [self::EXTENSION_TYPE => self::EXTENSION_TYPE_CORE],
168168
],
169169
'blackfire' => [
170-
'>=7.2 <8.1' => [
171-
self::EXTENSION_TYPE => self::EXTENSION_TYPE_INSTALLATION_SCRIPT,
172-
// phpcs:disable
173-
self::EXTENSION_INSTALLATION_SCRIPT => <<< BASH
174-
curl -L https://packages.blackfire.io/gpg.key | apt-key add
175-
echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list
176-
apt-get update
177-
apt-get install blackfire-php
178-
rm -rf /var/lib/apt/lists/*
179-
BASH
180-
// phpcs:enable
181-
],
182-
'>=8.1' => [
170+
'>=7.2' => [
183171
self::EXTENSION_TYPE => self::EXTENSION_TYPE_INSTALLATION_SCRIPT,
184172
self::EXTENSION_OS_DEPENDENCIES => [
185173
'gnupg2',

0 commit comments

Comments
 (0)