Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Yarn signatures #28

Merged
merged 1 commit into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions php/src/80/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions php/src/81/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions php/src/82/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down