Skip to content

Commit d205d57

Browse files
juliusknorrjuliusknorr
committed
fixup! fix: One apt install
1 parent d88b367 commit d205d57

10 files changed

Lines changed: 70 additions & 60 deletions

File tree

‎docker/Dockerfile.php.template‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
30+
ADD https://packages.blackfire.io/gpg.key /tmp/blackfire.gpg.key
31+
RUN cat /tmp/blackfire.gpg.key | sudo apt-key add - \
3132
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
3233

3334
# dev tools separate install so we quickly change without rebuilding all php extensions
@@ -51,11 +52,11 @@ RUN apt update && apt-get install -y --no-install-recommends \
5152
&& rm -rf /var/lib/apt/lists/*
5253

5354
# Install PHPUnit
54-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
55-
&& chmod +x /usr/local/bin/phpunit8 \
56-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
57-
&& chmod +x /usr/local/bin/phpunit9 \
58-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
55+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
56+
&& chmod +x /usr/local/bin/phpunit11 \
57+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
58+
&& chmod +x /usr/local/bin/phpunit12 \
59+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
5960

6061
# Install NVM
6162
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \

‎docker/Dockerfile.php71‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
30+
ADD https://packages.blackfire.io/gpg.key /tmp/blackfire.gpg.key
31+
RUN cat /tmp/blackfire.gpg.key | sudo apt-key add - \
3132
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
3233

3334
# dev tools separate install so we quickly change without rebuilding all php extensions
@@ -51,11 +52,11 @@ RUN apt update && apt-get install -y --no-install-recommends \
5152
&& rm -rf /var/lib/apt/lists/*
5253

5354
# Install PHPUnit
54-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
55-
&& chmod +x /usr/local/bin/phpunit8 \
56-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
57-
&& chmod +x /usr/local/bin/phpunit9 \
58-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
55+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
56+
&& chmod +x /usr/local/bin/phpunit11 \
57+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
58+
&& chmod +x /usr/local/bin/phpunit12 \
59+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
5960

6061
# Install NVM
6162
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \

‎docker/Dockerfile.php72‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
30+
ADD https://packages.blackfire.io/gpg.key /tmp/blackfire.gpg.key
31+
RUN cat /tmp/blackfire.gpg.key | sudo apt-key add - \
3132
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
3233

3334
# dev tools separate install so we quickly change without rebuilding all php extensions
@@ -51,11 +52,11 @@ RUN apt update && apt-get install -y --no-install-recommends \
5152
&& rm -rf /var/lib/apt/lists/*
5253

5354
# Install PHPUnit
54-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
55-
&& chmod +x /usr/local/bin/phpunit8 \
56-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
57-
&& chmod +x /usr/local/bin/phpunit9 \
58-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
55+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
56+
&& chmod +x /usr/local/bin/phpunit11 \
57+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
58+
&& chmod +x /usr/local/bin/phpunit12 \
59+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
5960

6061
# Install NVM
6162
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \

‎docker/Dockerfile.php73‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
30+
ADD https://packages.blackfire.io/gpg.key /tmp/blackfire.gpg.key
31+
RUN cat /tmp/blackfire.gpg.key | sudo apt-key add - \
3132
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
3233

3334
# dev tools separate install so we quickly change without rebuilding all php extensions
@@ -51,11 +52,11 @@ RUN apt update && apt-get install -y --no-install-recommends \
5152
&& rm -rf /var/lib/apt/lists/*
5253

5354
# Install PHPUnit
54-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
55-
&& chmod +x /usr/local/bin/phpunit8 \
56-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
57-
&& chmod +x /usr/local/bin/phpunit9 \
58-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
55+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
56+
&& chmod +x /usr/local/bin/phpunit11 \
57+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
58+
&& chmod +x /usr/local/bin/phpunit12 \
59+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
5960

6061
# Install NVM
6162
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \

‎docker/Dockerfile.php74‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
30+
ADD https://packages.blackfire.io/gpg.key /tmp/blackfire.gpg.key
31+
RUN cat /tmp/blackfire.gpg.key | sudo apt-key add - \
3132
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
3233

3334
# dev tools separate install so we quickly change without rebuilding all php extensions
@@ -51,11 +52,11 @@ RUN apt update && apt-get install -y --no-install-recommends \
5152
&& rm -rf /var/lib/apt/lists/*
5253

5354
# Install PHPUnit
54-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
55-
&& chmod +x /usr/local/bin/phpunit8 \
56-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
57-
&& chmod +x /usr/local/bin/phpunit9 \
58-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
55+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
56+
&& chmod +x /usr/local/bin/phpunit11 \
57+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
58+
&& chmod +x /usr/local/bin/phpunit12 \
59+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
5960

6061
# Install NVM
6162
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \

‎docker/Dockerfile.php80‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
30+
ADD https://packages.blackfire.io/gpg.key /tmp/blackfire.gpg.key
31+
RUN cat /tmp/blackfire.gpg.key | sudo apt-key add - \
3132
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
3233

3334
# dev tools separate install so we quickly change without rebuilding all php extensions
@@ -51,11 +52,11 @@ RUN apt update && apt-get install -y --no-install-recommends \
5152
&& rm -rf /var/lib/apt/lists/*
5253

5354
# Install PHPUnit
54-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
55-
&& chmod +x /usr/local/bin/phpunit8 \
56-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
57-
&& chmod +x /usr/local/bin/phpunit9 \
58-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
55+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
56+
&& chmod +x /usr/local/bin/phpunit11 \
57+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
58+
&& chmod +x /usr/local/bin/phpunit12 \
59+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
5960

6061
# Install NVM
6162
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \

‎docker/Dockerfile.php81‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
30+
ADD https://packages.blackfire.io/gpg.key /tmp/blackfire.gpg.key
31+
RUN cat /tmp/blackfire.gpg.key | sudo apt-key add - \
3132
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
3233

3334
# dev tools separate install so we quickly change without rebuilding all php extensions
@@ -51,11 +52,11 @@ RUN apt update && apt-get install -y --no-install-recommends \
5152
&& rm -rf /var/lib/apt/lists/*
5253

5354
# Install PHPUnit
54-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
55-
&& chmod +x /usr/local/bin/phpunit8 \
56-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
57-
&& chmod +x /usr/local/bin/phpunit9 \
58-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
55+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
56+
&& chmod +x /usr/local/bin/phpunit11 \
57+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
58+
&& chmod +x /usr/local/bin/phpunit12 \
59+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
5960

6061
# Install NVM
6162
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \

‎docker/php82/Dockerfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
30+
ADD https://packages.blackfire.io/gpg.key /tmp/blackfire.gpg.key
31+
RUN cat /tmp/blackfire.gpg.key | sudo apt-key add - \
3132
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
3233

3334
# dev tools separate install so we quickly change without rebuilding all php extensions
@@ -51,11 +52,11 @@ RUN apt update && apt-get install -y --no-install-recommends \
5152
&& rm -rf /var/lib/apt/lists/*
5253

5354
# Install PHPUnit
54-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
55-
&& chmod +x /usr/local/bin/phpunit8 \
56-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
57-
&& chmod +x /usr/local/bin/phpunit9 \
58-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
55+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
56+
&& chmod +x /usr/local/bin/phpunit11 \
57+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
58+
&& chmod +x /usr/local/bin/phpunit12 \
59+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
5960

6061
# Install NVM
6162
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \

‎docker/php83/Dockerfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
30+
ADD https://packages.blackfire.io/gpg.key /tmp/blackfire.gpg.key
31+
RUN cat /tmp/blackfire.gpg.key | sudo apt-key add - \
3132
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
3233

3334
# dev tools separate install so we quickly change without rebuilding all php extensions
@@ -51,11 +52,11 @@ RUN apt update && apt-get install -y --no-install-recommends \
5152
&& rm -rf /var/lib/apt/lists/*
5253

5354
# Install PHPUnit
54-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
55-
&& chmod +x /usr/local/bin/phpunit8 \
56-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
57-
&& chmod +x /usr/local/bin/phpunit9 \
58-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
55+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
56+
&& chmod +x /usr/local/bin/phpunit11 \
57+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
58+
&& chmod +x /usr/local/bin/phpunit12 \
59+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
5960

6061
# Install NVM
6162
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \

‎docker/php84/Dockerfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
30+
ADD https://packages.blackfire.io/gpg.key /tmp/blackfire.gpg.key
31+
RUN cat /tmp/blackfire.gpg.key | sudo apt-key add - \
3132
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
3233

3334
# dev tools separate install so we quickly change without rebuilding all php extensions
@@ -51,11 +52,11 @@ RUN apt update && apt-get install -y --no-install-recommends \
5152
&& rm -rf /var/lib/apt/lists/*
5253

5354
# Install PHPUnit
54-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
55-
&& chmod +x /usr/local/bin/phpunit8 \
56-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
57-
&& chmod +x /usr/local/bin/phpunit9 \
58-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
55+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
56+
&& chmod +x /usr/local/bin/phpunit11 \
57+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
58+
&& chmod +x /usr/local/bin/phpunit12 \
59+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
5960

6061
# Install NVM
6162
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \

0 commit comments

Comments
 (0)