Skip to content

Commit 4c7f6ce

Browse files
Merge branch 'devcontainers:gh-pages' into gh-pages
2 parents 35a00c4 + 65d7092 commit 4c7f6ce

Some content is hidden

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

41 files changed

+2178
-615
lines changed

Diff for: .codesandbox/tasks.json

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
// These tasks will run in order when initializing your CodeSandbox project.
3+
"setupTasks": [
4+
{
5+
"name": "Install dependencies",
6+
"command": "bundle install"
7+
}
8+
],
9+
10+
// These tasks can be run from CodeSandbox. Running one will open a log in the app.
11+
"tasks": {
12+
"bundle exec jekyll serve": {
13+
"name": "bundle exec jekyll serve",
14+
"command": "bundle exec jekyll serve --host 0.0.0.0",
15+
"runAtStart": true,
16+
"preview": {
17+
"port": 4000
18+
}
19+
},
20+
"ruby:typecheck": {
21+
"name": "Typecheck",
22+
"command": "solargraph typecheck"
23+
}
24+
}
25+
}

Diff for: .devcontainer/Dockerfile

-14
This file was deleted.

Diff for: .devcontainer/base.Dockerfile

-26
This file was deleted.

Diff for: .devcontainer/devcontainer.json

+18-22
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2-
// https://github.com/microsoft/vscode-dev-containers/tree/v0.231.6/containers/jekyll
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/jekyll
33
{
44
"name": "Jekyll",
5-
"build": {
6-
"dockerfile": "Dockerfile",
7-
"args": {
8-
// Update 'VARIANT' to pick a Debian OS version: bullseye, buster
9-
// Use bullseye when on local arm64/Apple Silicon.
10-
"VARIANT": "bullseye",
11-
// Enable Node.js: pick the latest LTS version
12-
"NODE_VERSION": "lts/*"
13-
}
14-
},
15-
16-
// Set *default* container specific settings.json values on container create.
17-
"settings": {},
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/jekyll:1-bullseye",
187

19-
// Add the IDs of extensions you want installed when the container is created.
20-
"extensions": [],
8+
// Features to add to the dev container. More info: https://containers.dev/features.
9+
"features": {
10+
"ghcr.io/devcontainers/features/node:1": {
11+
"version": "latest"
12+
}
13+
},
2114

2215
// Use 'forwardPorts' to make a list of ports inside the container available locally.
2316
"forwardPorts": [
2417
// Jekyll server
2518
4000,
2619
// Live reload server
2720
35729
28-
],
21+
]
22+
23+
// Uncomment the next line to run commands after the container is created.
24+
// "postCreateCommand": "jekyll --version"
2925

30-
// Use 'postCreateCommand' to run commands after the container is created.
31-
"postCreateCommand": "sh .devcontainer/post-create.sh",
26+
// Configure tool-specific properties.
27+
// "customizations": {},
3228

33-
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
34-
"remoteUser": "vscode"
29+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
30+
// "remoteUser": "root"
3531
}

Diff for: .devcontainer/post-create.sh

-12
This file was deleted.

Diff for: .gitattributes

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
* text=auto eol=lf
2+
*.{cmd,[cC][mM][dD]} text eol=crlf
3+
*.{bat,[bB][aA][tT]} text eol=crlf

Diff for: .github/workflows/publish.yml

+6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ jobs:
3636
mv oras-install/oras /usr/local/bin/
3737
rm -rf oras_0.13.0_*.tar.gz oras-install/
3838
39+
- name: Fetch devcontainer-control-manifest.json
40+
run: |
41+
cd _data
42+
oras pull ghcr.io/devcontainers/control-manifest:latest
43+
cp devcontainer-control-manifest.json ../static/
44+
3945
- name: Fetch devcontainer-index.json
4046
run: |
4147
cd _data

Diff for: .gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ npm-debug.log
22
_site
33
spec-generator/node_modules
44
spec-generator/out
5-
devcontainer-index.json
5+
devcontainer-index.json
6+
devcontainer-control-manifest.json

Diff for: Gemfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22
ruby RUBY_VERSION
33

4-
gem "jekyll", "3.6.2"
4+
gem "jekyll", "3.9.3"
55

66
# to use GitHub Pages
77
# gem "github-pages", group: :jekyll_plugins
@@ -11,7 +11,10 @@ group :jekyll_plugins do
1111
gem "jemoji"
1212
gem "github-pages"
1313
gem "jekyll-remote-theme"
14+
gem "jekyll-feed"
1415
end
1516

1617
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
17-
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
18+
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
19+
20+
gem 'webrick', '~> 1.7'

0 commit comments

Comments
 (0)