From 02f091035624fbe51bf83ec12b48c11ec2cd9b02 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Mon, 8 Apr 2024 08:59:58 -0700 Subject: [PATCH 1/6] chore: organize site files under src directory --- _config.yml | 1 + 404.html => src/404.html | 0 {_data => src/_data}/certs.yml | 0 {_data => src/_data}/team.yml | 0 {_drafts => src/_drafts}/2023-09-01-first-post.md | 0 {_includes => src/_includes}/certs.html | 0 {_includes => src/_includes}/job-json.html | 0 {_includes => src/_includes}/nav.html | 0 .../associate-consultant-scheduling-coordinator.md | 0 {_jobs => src/_jobs}/creative-project-manager.md | 0 .../_jobs}/customer-success-account-manager.md | 0 {_jobs => src/_jobs}/executive-assistant.md | 0 {_jobs => src/_jobs}/product-manager.md | 0 {_jobs => src/_jobs}/software-engineer.md | 0 {_jobs => src/_jobs}/ux-ui-designer-researcher.md | 0 {_layouts => src/_layouts}/blog_post.html | 0 {_layouts => src/_layouts}/default.html | 0 {_layouts => src/_layouts}/job_post.html | 0 {_layouts => src/_layouts}/redirected.html | 0 {_posts => src/_posts}/2023-12-13-gift-guide.md | 0 {_posts => src/_posts}/2023-12-23-welcome.md | 0 ...024-01-24-devcontainer-platform-agnostic-team.md | 0 .../_posts}/2024-03-11-transportation-round-up.md | 0 .../2024-03-22-Civic-Tech-Career-Resources.md | 0 about.html => src/about.html | 0 apple-touch-icon.png => src/apple-touch-icon.png | Bin .../assets}/Compiler-Capabilities-Statement.pdf | Bin {assets => src/assets}/alert.svg | 0 ...2024-1-vscode-devcontainer-post-screenshot-1.jpg | Bin {assets => src/assets}/blog/MTAshirt.jpeg | Bin {assets => src/assets}/blog/Ornament.jpeg | Bin {assets => src/assets}/blog/Parkshirt.jpeg | Bin {assets => src/assets}/blog/RTclock.jpeg | Bin {assets => src/assets}/blog/Ring.jpeg | Bin {assets => src/assets}/blog/SFPoster.jpeg | Bin {assets => src/assets}/blog/Taiwan-min.jpg | Bin {assets => src/assets}/blog/bussin.jpeg | Bin .../assets}/blog/compiler-team-photo-for-blog.jpg | Bin {assets => src/assets}/blog/go-back.svg | 0 {assets => src/assets}/blog/jessica-sullivan.png | Bin {assets => src/assets}/blog/may2023-retreat.jpg | Bin .../white-glossy-mug-white-11oz-handle-on-right.jpg | Bin {assets => src/assets}/compiler_brandmark.svg | 0 {assets => src/assets}/compiler_brandpattern.svg | 0 {assets => src/assets}/compiler_logo_stacked.svg | 0 {assets => src/assets}/compiler_share.png | Bin {assets => src/assets}/illustrations/bicycle.svg | 0 {assets => src/assets}/illustrations/bus.svg | 0 {assets => src/assets}/illustrations/circle.svg | 0 {assets => src/assets}/illustrations/footer.svg | 0 {assets => src/assets}/social_media/github.svg | 0 {assets => src/assets}/social_media/linkedin.svg | 0 {assets => src/assets}/team_members/angela-tran.png | Bin .../assets}/team_members/anthony-rollins.png | Bin {assets => src/assets}/team_members/kegan-maher.png | Bin .../assets}/team_members/laney-mangan.png | Bin .../assets}/team_members/machiko-yasuda.png | Bin .../assets}/team_members/marissa-rosemblat.png | Bin {assets => src/assets}/team_members/milo-green.png | Bin .../assets}/team_members/olivia-ramacier.png | Bin {assets => src/assets}/team_members/sarah-henry.png | Bin .../assets}/team_members/scott-frazier.png | Bin .../assets}/team_members/shelby-miller.png | Bin .../assets}/team_members/vyki-englert.png | Bin blog.html => src/blog.html | 0 capabilities.html => src/capabilities.html | 0 favicon.ico => src/favicon.ico | Bin icon.svg => src/icon.svg | 0 index.html => src/index.html | 0 jobs.html => src/jobs.html | 0 retreat.html => src/retreat.html | 0 {styles => src/styles}/base.css | 0 {styles => src/styles}/nav.css | 0 73 files changed, 1 insertion(+) rename 404.html => src/404.html (100%) rename {_data => src/_data}/certs.yml (100%) rename {_data => src/_data}/team.yml (100%) rename {_drafts => src/_drafts}/2023-09-01-first-post.md (100%) rename {_includes => src/_includes}/certs.html (100%) rename {_includes => src/_includes}/job-json.html (100%) rename {_includes => src/_includes}/nav.html (100%) rename {_jobs => src/_jobs}/associate-consultant-scheduling-coordinator.md (100%) rename {_jobs => src/_jobs}/creative-project-manager.md (100%) rename {_jobs => src/_jobs}/customer-success-account-manager.md (100%) rename {_jobs => src/_jobs}/executive-assistant.md (100%) rename {_jobs => src/_jobs}/product-manager.md (100%) rename {_jobs => src/_jobs}/software-engineer.md (100%) rename {_jobs => src/_jobs}/ux-ui-designer-researcher.md (100%) rename {_layouts => src/_layouts}/blog_post.html (100%) rename {_layouts => src/_layouts}/default.html (100%) rename {_layouts => src/_layouts}/job_post.html (100%) rename {_layouts => src/_layouts}/redirected.html (100%) rename {_posts => src/_posts}/2023-12-13-gift-guide.md (100%) rename {_posts => src/_posts}/2023-12-23-welcome.md (100%) rename {_posts => src/_posts}/2024-01-24-devcontainer-platform-agnostic-team.md (100%) rename {_posts => src/_posts}/2024-03-11-transportation-round-up.md (100%) rename {_posts => src/_posts}/2024-03-22-Civic-Tech-Career-Resources.md (100%) rename about.html => src/about.html (100%) rename apple-touch-icon.png => src/apple-touch-icon.png (100%) rename {assets => src/assets}/Compiler-Capabilities-Statement.pdf (100%) rename {assets => src/assets}/alert.svg (100%) rename {assets => src/assets}/blog/2024/2024-1-vscode-devcontainer-post-screenshot-1.jpg (100%) rename {assets => src/assets}/blog/MTAshirt.jpeg (100%) rename {assets => src/assets}/blog/Ornament.jpeg (100%) rename {assets => src/assets}/blog/Parkshirt.jpeg (100%) rename {assets => src/assets}/blog/RTclock.jpeg (100%) rename {assets => src/assets}/blog/Ring.jpeg (100%) rename {assets => src/assets}/blog/SFPoster.jpeg (100%) rename {assets => src/assets}/blog/Taiwan-min.jpg (100%) rename {assets => src/assets}/blog/bussin.jpeg (100%) rename {assets => src/assets}/blog/compiler-team-photo-for-blog.jpg (100%) rename {assets => src/assets}/blog/go-back.svg (100%) rename {assets => src/assets}/blog/jessica-sullivan.png (100%) rename {assets => src/assets}/blog/may2023-retreat.jpg (100%) rename {assets => src/assets}/blog/white-glossy-mug-white-11oz-handle-on-right.jpg (100%) rename {assets => src/assets}/compiler_brandmark.svg (100%) rename {assets => src/assets}/compiler_brandpattern.svg (100%) rename {assets => src/assets}/compiler_logo_stacked.svg (100%) rename {assets => src/assets}/compiler_share.png (100%) rename {assets => src/assets}/illustrations/bicycle.svg (100%) rename {assets => src/assets}/illustrations/bus.svg (100%) rename {assets => src/assets}/illustrations/circle.svg (100%) rename {assets => src/assets}/illustrations/footer.svg (100%) rename {assets => src/assets}/social_media/github.svg (100%) rename {assets => src/assets}/social_media/linkedin.svg (100%) rename {assets => src/assets}/team_members/angela-tran.png (100%) rename {assets => src/assets}/team_members/anthony-rollins.png (100%) rename {assets => src/assets}/team_members/kegan-maher.png (100%) rename {assets => src/assets}/team_members/laney-mangan.png (100%) rename {assets => src/assets}/team_members/machiko-yasuda.png (100%) rename {assets => src/assets}/team_members/marissa-rosemblat.png (100%) rename {assets => src/assets}/team_members/milo-green.png (100%) rename {assets => src/assets}/team_members/olivia-ramacier.png (100%) rename {assets => src/assets}/team_members/sarah-henry.png (100%) rename {assets => src/assets}/team_members/scott-frazier.png (100%) rename {assets => src/assets}/team_members/shelby-miller.png (100%) rename {assets => src/assets}/team_members/vyki-englert.png (100%) rename blog.html => src/blog.html (100%) rename capabilities.html => src/capabilities.html (100%) rename favicon.ico => src/favicon.ico (100%) rename icon.svg => src/icon.svg (100%) rename index.html => src/index.html (100%) rename jobs.html => src/jobs.html (100%) rename retreat.html => src/retreat.html (100%) rename {styles => src/styles}/base.css (100%) rename {styles => src/styles}/nav.css (100%) diff --git a/_config.yml b/_config.yml index 9f8f7deb..ee341eb0 100644 --- a/_config.yml +++ b/_config.yml @@ -5,3 +5,4 @@ collections: posts: output: true permalink: /blog/:year/:title:output_ext +source: ./src diff --git a/404.html b/src/404.html similarity index 100% rename from 404.html rename to src/404.html diff --git a/_data/certs.yml b/src/_data/certs.yml similarity index 100% rename from _data/certs.yml rename to src/_data/certs.yml diff --git a/_data/team.yml b/src/_data/team.yml similarity index 100% rename from _data/team.yml rename to src/_data/team.yml diff --git a/_drafts/2023-09-01-first-post.md b/src/_drafts/2023-09-01-first-post.md similarity index 100% rename from _drafts/2023-09-01-first-post.md rename to src/_drafts/2023-09-01-first-post.md diff --git a/_includes/certs.html b/src/_includes/certs.html similarity index 100% rename from _includes/certs.html rename to src/_includes/certs.html diff --git a/_includes/job-json.html b/src/_includes/job-json.html similarity index 100% rename from _includes/job-json.html rename to src/_includes/job-json.html diff --git a/_includes/nav.html b/src/_includes/nav.html similarity index 100% rename from _includes/nav.html rename to src/_includes/nav.html diff --git a/_jobs/associate-consultant-scheduling-coordinator.md b/src/_jobs/associate-consultant-scheduling-coordinator.md similarity index 100% rename from _jobs/associate-consultant-scheduling-coordinator.md rename to src/_jobs/associate-consultant-scheduling-coordinator.md diff --git a/_jobs/creative-project-manager.md b/src/_jobs/creative-project-manager.md similarity index 100% rename from _jobs/creative-project-manager.md rename to src/_jobs/creative-project-manager.md diff --git a/_jobs/customer-success-account-manager.md b/src/_jobs/customer-success-account-manager.md similarity index 100% rename from _jobs/customer-success-account-manager.md rename to src/_jobs/customer-success-account-manager.md diff --git a/_jobs/executive-assistant.md b/src/_jobs/executive-assistant.md similarity index 100% rename from _jobs/executive-assistant.md rename to src/_jobs/executive-assistant.md diff --git a/_jobs/product-manager.md b/src/_jobs/product-manager.md similarity index 100% rename from _jobs/product-manager.md rename to src/_jobs/product-manager.md diff --git a/_jobs/software-engineer.md b/src/_jobs/software-engineer.md similarity index 100% rename from _jobs/software-engineer.md rename to src/_jobs/software-engineer.md diff --git a/_jobs/ux-ui-designer-researcher.md b/src/_jobs/ux-ui-designer-researcher.md similarity index 100% rename from _jobs/ux-ui-designer-researcher.md rename to src/_jobs/ux-ui-designer-researcher.md diff --git a/_layouts/blog_post.html b/src/_layouts/blog_post.html similarity index 100% rename from _layouts/blog_post.html rename to src/_layouts/blog_post.html diff --git a/_layouts/default.html b/src/_layouts/default.html similarity index 100% rename from _layouts/default.html rename to src/_layouts/default.html diff --git a/_layouts/job_post.html b/src/_layouts/job_post.html similarity index 100% rename from _layouts/job_post.html rename to src/_layouts/job_post.html diff --git a/_layouts/redirected.html b/src/_layouts/redirected.html similarity index 100% rename from _layouts/redirected.html rename to src/_layouts/redirected.html diff --git a/_posts/2023-12-13-gift-guide.md b/src/_posts/2023-12-13-gift-guide.md similarity index 100% rename from _posts/2023-12-13-gift-guide.md rename to src/_posts/2023-12-13-gift-guide.md diff --git a/_posts/2023-12-23-welcome.md b/src/_posts/2023-12-23-welcome.md similarity index 100% rename from _posts/2023-12-23-welcome.md rename to src/_posts/2023-12-23-welcome.md diff --git a/_posts/2024-01-24-devcontainer-platform-agnostic-team.md b/src/_posts/2024-01-24-devcontainer-platform-agnostic-team.md similarity index 100% rename from _posts/2024-01-24-devcontainer-platform-agnostic-team.md rename to src/_posts/2024-01-24-devcontainer-platform-agnostic-team.md diff --git a/_posts/2024-03-11-transportation-round-up.md b/src/_posts/2024-03-11-transportation-round-up.md similarity index 100% rename from _posts/2024-03-11-transportation-round-up.md rename to src/_posts/2024-03-11-transportation-round-up.md diff --git a/_posts/2024-03-22-Civic-Tech-Career-Resources.md b/src/_posts/2024-03-22-Civic-Tech-Career-Resources.md similarity index 100% rename from _posts/2024-03-22-Civic-Tech-Career-Resources.md rename to src/_posts/2024-03-22-Civic-Tech-Career-Resources.md diff --git a/about.html b/src/about.html similarity index 100% rename from about.html rename to src/about.html diff --git a/apple-touch-icon.png b/src/apple-touch-icon.png similarity index 100% rename from apple-touch-icon.png rename to src/apple-touch-icon.png diff --git a/assets/Compiler-Capabilities-Statement.pdf b/src/assets/Compiler-Capabilities-Statement.pdf similarity index 100% rename from assets/Compiler-Capabilities-Statement.pdf rename to src/assets/Compiler-Capabilities-Statement.pdf diff --git a/assets/alert.svg b/src/assets/alert.svg similarity index 100% rename from assets/alert.svg rename to src/assets/alert.svg diff --git a/assets/blog/2024/2024-1-vscode-devcontainer-post-screenshot-1.jpg b/src/assets/blog/2024/2024-1-vscode-devcontainer-post-screenshot-1.jpg similarity index 100% rename from assets/blog/2024/2024-1-vscode-devcontainer-post-screenshot-1.jpg rename to src/assets/blog/2024/2024-1-vscode-devcontainer-post-screenshot-1.jpg diff --git a/assets/blog/MTAshirt.jpeg b/src/assets/blog/MTAshirt.jpeg similarity index 100% rename from assets/blog/MTAshirt.jpeg rename to src/assets/blog/MTAshirt.jpeg diff --git a/assets/blog/Ornament.jpeg b/src/assets/blog/Ornament.jpeg similarity index 100% rename from assets/blog/Ornament.jpeg rename to src/assets/blog/Ornament.jpeg diff --git a/assets/blog/Parkshirt.jpeg b/src/assets/blog/Parkshirt.jpeg similarity index 100% rename from assets/blog/Parkshirt.jpeg rename to src/assets/blog/Parkshirt.jpeg diff --git a/assets/blog/RTclock.jpeg b/src/assets/blog/RTclock.jpeg similarity index 100% rename from assets/blog/RTclock.jpeg rename to src/assets/blog/RTclock.jpeg diff --git a/assets/blog/Ring.jpeg b/src/assets/blog/Ring.jpeg similarity index 100% rename from assets/blog/Ring.jpeg rename to src/assets/blog/Ring.jpeg diff --git a/assets/blog/SFPoster.jpeg b/src/assets/blog/SFPoster.jpeg similarity index 100% rename from assets/blog/SFPoster.jpeg rename to src/assets/blog/SFPoster.jpeg diff --git a/assets/blog/Taiwan-min.jpg b/src/assets/blog/Taiwan-min.jpg similarity index 100% rename from assets/blog/Taiwan-min.jpg rename to src/assets/blog/Taiwan-min.jpg diff --git a/assets/blog/bussin.jpeg b/src/assets/blog/bussin.jpeg similarity index 100% rename from assets/blog/bussin.jpeg rename to src/assets/blog/bussin.jpeg diff --git a/assets/blog/compiler-team-photo-for-blog.jpg b/src/assets/blog/compiler-team-photo-for-blog.jpg similarity index 100% rename from assets/blog/compiler-team-photo-for-blog.jpg rename to src/assets/blog/compiler-team-photo-for-blog.jpg diff --git a/assets/blog/go-back.svg b/src/assets/blog/go-back.svg similarity index 100% rename from assets/blog/go-back.svg rename to src/assets/blog/go-back.svg diff --git a/assets/blog/jessica-sullivan.png b/src/assets/blog/jessica-sullivan.png similarity index 100% rename from assets/blog/jessica-sullivan.png rename to src/assets/blog/jessica-sullivan.png diff --git a/assets/blog/may2023-retreat.jpg b/src/assets/blog/may2023-retreat.jpg similarity index 100% rename from assets/blog/may2023-retreat.jpg rename to src/assets/blog/may2023-retreat.jpg diff --git a/assets/blog/white-glossy-mug-white-11oz-handle-on-right.jpg b/src/assets/blog/white-glossy-mug-white-11oz-handle-on-right.jpg similarity index 100% rename from assets/blog/white-glossy-mug-white-11oz-handle-on-right.jpg rename to src/assets/blog/white-glossy-mug-white-11oz-handle-on-right.jpg diff --git a/assets/compiler_brandmark.svg b/src/assets/compiler_brandmark.svg similarity index 100% rename from assets/compiler_brandmark.svg rename to src/assets/compiler_brandmark.svg diff --git a/assets/compiler_brandpattern.svg b/src/assets/compiler_brandpattern.svg similarity index 100% rename from assets/compiler_brandpattern.svg rename to src/assets/compiler_brandpattern.svg diff --git a/assets/compiler_logo_stacked.svg b/src/assets/compiler_logo_stacked.svg similarity index 100% rename from assets/compiler_logo_stacked.svg rename to src/assets/compiler_logo_stacked.svg diff --git a/assets/compiler_share.png b/src/assets/compiler_share.png similarity index 100% rename from assets/compiler_share.png rename to src/assets/compiler_share.png diff --git a/assets/illustrations/bicycle.svg b/src/assets/illustrations/bicycle.svg similarity index 100% rename from assets/illustrations/bicycle.svg rename to src/assets/illustrations/bicycle.svg diff --git a/assets/illustrations/bus.svg b/src/assets/illustrations/bus.svg similarity index 100% rename from assets/illustrations/bus.svg rename to src/assets/illustrations/bus.svg diff --git a/assets/illustrations/circle.svg b/src/assets/illustrations/circle.svg similarity index 100% rename from assets/illustrations/circle.svg rename to src/assets/illustrations/circle.svg diff --git a/assets/illustrations/footer.svg b/src/assets/illustrations/footer.svg similarity index 100% rename from assets/illustrations/footer.svg rename to src/assets/illustrations/footer.svg diff --git a/assets/social_media/github.svg b/src/assets/social_media/github.svg similarity index 100% rename from assets/social_media/github.svg rename to src/assets/social_media/github.svg diff --git a/assets/social_media/linkedin.svg b/src/assets/social_media/linkedin.svg similarity index 100% rename from assets/social_media/linkedin.svg rename to src/assets/social_media/linkedin.svg diff --git a/assets/team_members/angela-tran.png b/src/assets/team_members/angela-tran.png similarity index 100% rename from assets/team_members/angela-tran.png rename to src/assets/team_members/angela-tran.png diff --git a/assets/team_members/anthony-rollins.png b/src/assets/team_members/anthony-rollins.png similarity index 100% rename from assets/team_members/anthony-rollins.png rename to src/assets/team_members/anthony-rollins.png diff --git a/assets/team_members/kegan-maher.png b/src/assets/team_members/kegan-maher.png similarity index 100% rename from assets/team_members/kegan-maher.png rename to src/assets/team_members/kegan-maher.png diff --git a/assets/team_members/laney-mangan.png b/src/assets/team_members/laney-mangan.png similarity index 100% rename from assets/team_members/laney-mangan.png rename to src/assets/team_members/laney-mangan.png diff --git a/assets/team_members/machiko-yasuda.png b/src/assets/team_members/machiko-yasuda.png similarity index 100% rename from assets/team_members/machiko-yasuda.png rename to src/assets/team_members/machiko-yasuda.png diff --git a/assets/team_members/marissa-rosemblat.png b/src/assets/team_members/marissa-rosemblat.png similarity index 100% rename from assets/team_members/marissa-rosemblat.png rename to src/assets/team_members/marissa-rosemblat.png diff --git a/assets/team_members/milo-green.png b/src/assets/team_members/milo-green.png similarity index 100% rename from assets/team_members/milo-green.png rename to src/assets/team_members/milo-green.png diff --git a/assets/team_members/olivia-ramacier.png b/src/assets/team_members/olivia-ramacier.png similarity index 100% rename from assets/team_members/olivia-ramacier.png rename to src/assets/team_members/olivia-ramacier.png diff --git a/assets/team_members/sarah-henry.png b/src/assets/team_members/sarah-henry.png similarity index 100% rename from assets/team_members/sarah-henry.png rename to src/assets/team_members/sarah-henry.png diff --git a/assets/team_members/scott-frazier.png b/src/assets/team_members/scott-frazier.png similarity index 100% rename from assets/team_members/scott-frazier.png rename to src/assets/team_members/scott-frazier.png diff --git a/assets/team_members/shelby-miller.png b/src/assets/team_members/shelby-miller.png similarity index 100% rename from assets/team_members/shelby-miller.png rename to src/assets/team_members/shelby-miller.png diff --git a/assets/team_members/vyki-englert.png b/src/assets/team_members/vyki-englert.png similarity index 100% rename from assets/team_members/vyki-englert.png rename to src/assets/team_members/vyki-englert.png diff --git a/blog.html b/src/blog.html similarity index 100% rename from blog.html rename to src/blog.html diff --git a/capabilities.html b/src/capabilities.html similarity index 100% rename from capabilities.html rename to src/capabilities.html diff --git a/favicon.ico b/src/favicon.ico similarity index 100% rename from favicon.ico rename to src/favicon.ico diff --git a/icon.svg b/src/icon.svg similarity index 100% rename from icon.svg rename to src/icon.svg diff --git a/index.html b/src/index.html similarity index 100% rename from index.html rename to src/index.html diff --git a/jobs.html b/src/jobs.html similarity index 100% rename from jobs.html rename to src/jobs.html diff --git a/retreat.html b/src/retreat.html similarity index 100% rename from retreat.html rename to src/retreat.html diff --git a/styles/base.css b/src/styles/base.css similarity index 100% rename from styles/base.css rename to src/styles/base.css diff --git a/styles/nav.css b/src/styles/nav.css similarity index 100% rename from styles/nav.css rename to src/styles/nav.css From 7d84ed33a3b3384b6fe2f293c911d2d1a4366897 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Mon, 8 Apr 2024 09:24:08 -0700 Subject: [PATCH 2/6] fix(devcontainer): update syntax for customizations --- .devcontainer/devcontainer.json | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 51e4bb4b..70f73b31 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,20 +4,23 @@ "service": "site", "workspaceFolder": "/srv/jekyll", "postAttachCommand": ["/bin/bash", ".devcontainer/postAttach.sh"], - "settings": { - "terminal.integrated.defaultProfile.linux": "bash", - "terminal.integrated.profiles.linux": { - "bash": { - "path": "/bin/bash" - } + "customizations": { + "vscode": { + "settings": { + "terminal.integrated.defaultProfile.linux": "bash", + "terminal.integrated.profiles.linux": { + "bash": { + "path": "/bin/bash" + } + } + }, + "extensions": [ + "eamodio.gitlens", + "esbenp.prettier-vscode", + "mhutchie.git-graph", + "redhat.vscode-xml", + "sissel.shopify-liquid" + ] } - }, - "extensions": [ - "eamodio.gitlens", - "esbenp.prettier-vscode", - "mhutchie.git-graph", - "redhat.vscode-xml", - "sissel.shopify-liquid", - "" - ] + } } From 913919f5e3562a481dfe792b4dd0eb427e03c2b0 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Mon, 8 Apr 2024 10:12:37 -0700 Subject: [PATCH 3/6] chore(devcontainer): update base image to Python 3.11 --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index aef5f02c..92952750 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10 +FROM python:3.11 RUN apt-get update RUN apt-get install -y ruby-full && gem install bundler From 3ba1b24f6bfd0f659bdec90c5d891ea641ab8453 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Mon, 8 Apr 2024 17:20:21 +0000 Subject: [PATCH 4/6] chore(devcontainer): create a non-root user --- .devcontainer/Dockerfile | 13 ++++++++++++- .devcontainer/devcontainer.json | 2 +- .devcontainer/docker-compose.yaml | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 92952750..ad151ed2 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,12 +1,23 @@ FROM python:3.11 +ENV PYTHONDONTWRITEBYTECODE=1 \ + PYTHONUNBUFFERED=1 \ + USER=compiler + +RUN useradd --create-home --shell /bin/bash $USER && \ + chown -R $USER /home/$USER + +WORKDIR /home/$USER/site + RUN apt-get update RUN apt-get install -y ruby-full && gem install bundler RUN python -m pip install --upgrade pip - COPY Gemfile Gemfile COPY Gemfile.lock Gemfile.lock RUN bundle install COPY .devcontainer/requirements.txt .devcontainer/requirements.txt RUN pip install --no-cache-dir -r .devcontainer/requirements.txt + +USER $USER +ENV PATH "$PATH:/home/$USER/.local/bin" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 70f73b31..e3e50f1a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "compiler.la", "dockerComposeFile": "docker-compose.yaml", "service": "site", - "workspaceFolder": "/srv/jekyll", + "workspaceFolder": "/home/compiler/site", "postAttachCommand": ["/bin/bash", ".devcontainer/postAttach.sh"], "customizations": { "vscode": { diff --git a/.devcontainer/docker-compose.yaml b/.devcontainer/docker-compose.yaml index 93bce191..04114442 100644 --- a/.devcontainer/docker-compose.yaml +++ b/.devcontainer/docker-compose.yaml @@ -1,9 +1,9 @@ -version: '3' +version: "3" services: site: build: context: .. dockerfile: .devcontainer/Dockerfile volumes: - - ..:/srv/jekyll + - ..:/home/compiler/site command: sleep infinity From 1d58e53b168be66a11d8b0bfef34f9375b0648ce Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Mon, 8 Apr 2024 17:26:08 +0000 Subject: [PATCH 5/6] feat(devcontainer): add prettierrc file --- .prettierrc | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 00000000..4045ff35 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,5 @@ +{ + "tabWidth": 2, + "useTabs": false, + "printWidth": 130 +} From 8259eee353560f00ba906b4c3151ced55e3c194d Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Mon, 8 Apr 2024 17:30:33 +0000 Subject: [PATCH 6/6] feat(devcontainer): vscode settings normalization --- .vscode/settings.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..5fed93a2 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,13 @@ +{ + "editor.formatOnSave": true, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "files.encoding": "utf8", + "files.eol": "\n", + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + "files.trimTrailingWhitespace": true, + "editor.tabSize": 2, + "files.associations": { + "*.html": "liquid" + } +}