From 1d32ff04a2d21a52dbdba85d06a1d1b04dfd4564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9amus=20O=27Sullivan?= <seamus.osullivan@psych.ox.ac.uk> Date: Mon, 13 Jan 2025 10:30:54 +0000 Subject: [PATCH] Remove VSCode-specific files. Remove VSCode-specific files left over from JTD development, including .devcontainer and .vscode directories. --- .devcontainer/Dockerfile | 14 ------------- .devcontainer/base.Dockerfile | 26 ------------------------ .devcontainer/devcontainer.json | 35 --------------------------------- .devcontainer/post-create.sh | 12 ----------- .vscode/tasks.json | 26 ------------------------ 5 files changed, 113 deletions(-) delete mode 100644 .devcontainer/Dockerfile delete mode 100644 .devcontainer/base.Dockerfile delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 .devcontainer/post-create.sh delete mode 100644 .vscode/tasks.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index 19e72747..00000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): bullseye, buster -ARG VARIANT=bullseye -FROM mcr.microsoft.com/vscode/devcontainers/jekyll:0-${VARIANT} - -# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 -ARG NODE_VERSION="none" -RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi - -# [Optional] Uncomment this section to install additional OS packages. -# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ -# && apt-get -y install --no-install-recommends <your-package-list-here> - -# [Optional] Uncomment this line to install global node packages. -# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1 \ No newline at end of file diff --git a/.devcontainer/base.Dockerfile b/.devcontainer/base.Dockerfile deleted file mode 100644 index 9e3296a6..00000000 --- a/.devcontainer/base.Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# [Choice] Debian OS version (use 2.7-bullseye on local arm64/Apple Silicon): 2.7-bullseye, 2.7-buster -ARG VARIANT=2.7-bullseye -FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT} -COPY library-scripts/meta.env /usr/local/etc/vscode-dev-containers - -# ENV Variables required by Jekyll -ENV LANG=en_US.UTF-8 \ - LANGUAGE=en_US:en \ - TZ=Etc/UTC \ - LC_ALL=en_US.UTF-8 \ - LANG=en_US.UTF-8 \ - LANGUAGE=en_US - -# Install bundler, latest jekyll, and github-pages for older jekyll -RUN gem install bundler jekyll github-pages - -# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 -ARG NODE_VERSION="none" -RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi - -# [Optional] Uncomment this section to install additional OS packages. -# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ -# && apt-get -y install --no-install-recommends <your-package-list-here> - -# [Optional] Uncomment this line to install global node packages. -# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 5e561363..00000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,35 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.224.2/containers/jekyll -{ - "name": "Just the docs", - "build": { - "dockerfile": "Dockerfile", - "args": { - // Update 'VARIANT' to pick a Debian OS version: bullseye, buster - // Use bullseye when on local arm64/Apple Silicon. - "VARIANT": "bullseye", - // Enable Node.js: pick the latest LTS version - "NODE_VERSION": "lts/*" - } - }, - - // Set *default* container specific settings.json values on container create. - "settings": {}, - - // Add the IDs of extensions you want installed when the container is created. - "extensions": ["GitHub.vscode-pull-request-github"], - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - "forwardPorts": [ - // Jekyll server - 4000, - // Live reload server - 35729 - ], - - // Use 'postCreateCommand' to run commands after the container is created. - "postCreateCommand": "sh .devcontainer/post-create.sh", - - // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "vscode" -} diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh deleted file mode 100644 index 8c25f3d5..00000000 --- a/.devcontainer/post-create.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# Install the version of Bundler. -if [ -f Gemfile.lock ] && grep "BUNDLED WITH" Gemfile.lock > /dev/null; then - cat Gemfile.lock | tail -n 2 | grep -C2 "BUNDLED WITH" | tail -n 1 | xargs gem install bundler -v -fi - -# If there's a Gemfile, then run `bundle install` -# It's assumed that the Gemfile will install Jekyll too -if [ -f Gemfile ]; then - bundle install -fi diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 6d5d5f3c..00000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "Serve", - "type": "shell", - "command": "bundle exec jekyll serve --livereload", - "group": { - "kind": "test", - "isDefault": true - }, - "isBackground": true - }, - { - "label": "Build", - "type": "shell", - "command": "bundle exec jekyll build", - "group": { - "kind": "build", - "isDefault": true - } - } - ] -} -- GitLab