Skip to content

Commit 2ef80ba

Browse files
committed
merge with upstream
2 parents 7359ffc + e6542e3 commit 2ef80ba

File tree

172 files changed

+25460
-32504
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+25460
-32504
lines changed

.all-contributorsrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
"login": "alshedivat",
1616
"name": "Maruan",
1717
"avatar_url": "https://avatars.githubusercontent.com/u/2126561?v=4",
18-
"profile": "http://maruan.alshedivat.com",
18+
"profile": "https://maruan.alshedivat.com",
1919
"contributions": ["design", "code"]
2020
},
2121
{
2222
"login": "rohandebsarkar",
2323
"name": "Rohan Deb Sarkar",
2424
"avatar_url": "https://avatars.githubusercontent.com/u/50144004?v=4",
25-
"profile": "http://rohandebsarkar.github.io",
25+
"profile": "https://rohandebsarkar.github.io",
2626
"contributions": ["code"]
2727
},
2828
{

.devcontainer/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM mcr.microsoft.com/devcontainers/jekyll
2+
3+
# Fix: Remove the broken Yarn repository from the apt sources.
4+
# This prevents 'apt-get update' from failing due to the missing GPG key.
5+
# (Yarn is already provided by the dev container features/nvm, so this system repo is unnecessary)
6+
# See issue #3487
7+
RUN rm -f /etc/apt/sources.list.d/yarn.list

.devcontainer/devcontainer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
// README at: https://github.com/devcontainers/templates/tree/main/src/jekyll
33
{
44
"name": "Jekyll",
5-
"image": "mcr.microsoft.com/devcontainers/jekyll",
5+
// Using a Dockerfile to fix the broken Yarn repository. See issue #3487.
6+
"build": {
7+
"dockerfile": "Dockerfile"
8+
},
69

710
// Features to add to the dev container. More info: https://containers.dev/features.
811
"features": {

0 commit comments

Comments
 (0)