Fix Yarn signatures

yarnpkg/yarn#7866
pvtl · Mar 6, 2023 · eb67c59 · eb67c59
1 parent 96ca66a
commit eb67c59
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ It includes all the required dependencies for everyday PHP development with comm
 - PHP 8.1
     - Composer (latest)
     - Node.js (16.x) & NPM (latest)*
-    - Yarn (latest)*
+    - Yarn (latest of 1.x)*
     - PHPCS (with Wordpress code standards added)*
     - Wordpress CLI*
     - ZSH*
@@ -40,7 +40,7 @@ It includes all the required dependencies for everyday PHP development with comm
 
 *Optional:*
 
-- PHP 5.6, 7.0, 7.1, 7.2, 7.3 and 7.4
+- PHP 5.6, 7.0, 7.1, 7.2, 7.3, 7.4 and 8.0
 - Memcached 1.x
 - Redis 7.x
 - [Blackfire](https://blackfire.io/) (latest)

diff --git a/php/src/80/Dockerfile b/php/src/80/Dockerfile
@@ -53,8 +53,8 @@ RUN curl -L -o /usr/bin/mhsendmail https://github.com/mailhog/mhsendmail/release
   && chmod +x /usr/bin/mhsendmail
 
 # Install Yarn
-RUN curl -sS 'https://dl.yarnpkg.com/debian/pubkey.gpg' | apt-key add - \
-  && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | sudo tee /usr/share/keyrings/yarnkey.gpg >/dev/null \
+  && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list >/dev/null \
   && apt update \
   && apt install -y --no-install-recommends yarn \
   && apt clean \

diff --git a/php/src/81/Dockerfile b/php/src/81/Dockerfile
@@ -53,8 +53,8 @@ RUN curl -L -o /usr/bin/mhsendmail https://github.com/mailhog/mhsendmail/release
   && chmod +x /usr/bin/mhsendmail
 
 # Install Yarn
-RUN curl -sS 'https://dl.yarnpkg.com/debian/pubkey.gpg' | apt-key add - \
-  && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | sudo tee /usr/share/keyrings/yarnkey.gpg >/dev/null \
+  && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list >/dev/null \
   && apt update \
   && apt install -y --no-install-recommends yarn \
   && apt clean \

diff --git a/php/src/82/Dockerfile b/php/src/82/Dockerfile
@@ -53,8 +53,8 @@ RUN curl -L -o /usr/bin/mhsendmail https://github.com/mailhog/mhsendmail/release
   && chmod +x /usr/bin/mhsendmail
 
 # Install Yarn
-RUN curl -sS 'https://dl.yarnpkg.com/debian/pubkey.gpg' | apt-key add - \
-  && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | sudo tee /usr/share/keyrings/yarnkey.gpg >/dev/null \
+  && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list >/dev/null \
   && apt update \
   && apt install -y --no-install-recommends yarn \
   && apt clean \