Skip to content

D
devcontainer-features
Unverified Commit 54bb1d4e authored by Josh Spicer's avatar Josh Spicer Committed by GitHub
Browse files
Options

update jupyter and ruby features (#26) 

* jekyll and jupyter updates

* add ruby to jekylls pr test

* update jekyll and ruby test

* remove features that dont follow my rules
parent 9611a036
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 448 deletions
.github/workflows/test-all.yaml
View file @ 54bb1d4e
...@@ -24,13 +24,10 @@ jobs: ...@@ -24,13 +24,10 @@ jobs:
"git-lfs", "git-lfs",
"github-cli", "github-cli",
"go", "go",
"java gradle", # Install 'java', then 'gradle'
"hugo", "hugo",
"java", "java",
"ruby jekyll", # Install 'ruby', then 'jekyll'
"python jupyterlab", # Install 'python', then 'jupyterlab' "python jupyterlab", # Install 'python', then 'jupyterlab'
"kubectl-helm-minikube", "kubectl-helm-minikube",
"java maven", # Install 'java', then 'maven'
"node", "node",
"php", "php",
"powershell", "powershell",
......
.github/workflows/test-pr.yaml
View file @ 54bb1d4e
...@@ -24,13 +24,10 @@ jobs: ...@@ -24,13 +24,10 @@ jobs:
git-lfs: ./**/git-lfs/** git-lfs: ./**/git-lfs/**
github-cli: ./**/github-cli/** github-cli: ./**/github-cli/**
go: ./**/go/** go: ./**/go/**
'java gradle': ./**/gradle/**
hugo: ./**/hugo/** hugo: ./**/hugo/**
java: ./**/java/** java: ./**/java/**
jekyll: ./**/jekyll/**
'python jupyterlab': ./**/jupyterlab/** 'python jupyterlab': ./**/jupyterlab/**
kubectl-helm-minikube: ./**/kubectl-helm-minikube/** kubectl-helm-minikube: ./**/kubectl-helm-minikube/**
'java maven': ./**/maven/**
node: ./**/node/** node: ./**/node/**
php: ./**/php/** php: ./**/php/**
powershell: ./**/powershell/** powershell: ./**/powershell/**
......
src/gradle/feature.json deleted 100644 → 0
View file @ 9611a036
{
"id": "gradle",
"name": "Gradle (via SDKMAN!)",
"documentationURL": "https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/gradle.md",
"options": {
"version": {
"type": "string",
"proposals": [
"latest",
"none",
"7",
"6",
"5"
],
"default": "latest",
"description": "Select or enter a Gradle version to install"
}
},
"extensions": [
"vscjava.vscode-java-pack"
],
"containerEnv": {
"SDKMAN_DIR": "${SDKMAN_DIR:-\"/usr/local/sdkman\"}",
"PATH": "${SDKMAN_DIR}/bin:${SDKMAN_DIR}/candidates/gradle/current/bin:${PATH}"
},
"install": {
"app": "",
"file": "install.sh"
}
}
\ No newline at end of file
src/gradle/install.sh deleted 100644 → 0
View file @ 9611a036
#!/usr/bin/env bash
#-------------------------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------
#
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/gradle.md
# Maintainer: The VS Code and Codespaces Teams
#
# Syntax: ./gradle-debian.sh [Gradle version] [non-root user] [Update rc files flag]
GRADLE_VERSION=${1:-"latest"}
USERNAME=${2:-"automatic"}
UPDATE_RC=${3:-"true"}
export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"}
set -e
if [ "$(id -u)" -ne 0 ]; then
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
exit 1
fi
# Ensure that login shells get the correct path if the user updated the PATH using ENV.
rm -f /etc/profile.d/00-restore-env.sh
echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
chmod +x /etc/profile.d/00-restore-env.sh
# Determine the appropriate non-root user
if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
USERNAME=""
POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
for CURRENT_USER in ${POSSIBLE_USERS[@]}; do
if id -u ${CURRENT_USER} > /dev/null 2>&1; then
USERNAME=${CURRENT_USER}
break
fi
done
if [ "${USERNAME}" = "" ]; then
USERNAME=root
fi
elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
USERNAME=root
fi
updaterc() {
if [ "${UPDATE_RC}" = "true" ]; then
echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
echo -e "$1" >> /etc/bash.bashrc
fi
if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
echo -e "$1" >> /etc/zsh/zshrc
fi
fi
}
# Function to run apt-get if needed
apt_get_update_if_needed()
{
if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then
echo "Running apt-get update..."
apt-get update
else
echo "Skipping apt-get update."
fi
}
# Checks if packages are installed and installs them if not
check_packages() {
if ! dpkg -s "$@" > /dev/null 2>&1; then
apt_get_update_if_needed
apt-get -y install --no-install-recommends "$@"
fi
}
# Use SDKMAN to install something using a partial version match
sdk_install() {
local install_type=$1
local requested_version=$2
local prefix=$3
local suffix="${4:-"\\s*"}"
local full_version_check=${5:-".*-[a-z]+"}
if [ "${requested_version}" = "none" ]; then return; fi
# Blank will install latest stable version
if [ "${requested_version}" = "lts" ] || [ "${requested_version}" = "default" ]; then
requested_version=""
elif echo "${requested_version}" | grep -oE "${full_version_check}" > /dev/null 2>&1; then
echo "${requested_version}"
else
local regex="${prefix}\\K[0-9]+\\.[0-9]+\\.[0-9]+${suffix}"
local version_list="$(. ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} 2>&1 | grep -oP "${regex}" | tr -d ' ' | sort -rV)"
if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ]; then
requested_version="$(echo "${version_list}" | head -n 1)"
else
set +e
requested_version="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
set -e
fi
if [ -z "${requested_version}" ] || ! echo "${version_list}" | grep "^${requested_version//./\\.}$" > /dev/null 2>&1; then
echo -e "Version $2 not found. Available versions:\n${version_list}" >&2
exit 1
fi
fi
su ${USERNAME} -c "umask 0002 && . ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk install ${install_type} ${requested_version} && sdk flush archives && sdk flush temp"
}
export DEBIAN_FRONTEND=noninteractive
# Install dependencies
check_packages curl ca-certificates zip unzip sed
# Install sdkman if not installed
if [ ! -d "${SDKMAN_DIR}" ]; then
# Create sdkman group, dir, and set sticky bit
if ! cat /etc/group | grep -e "^sdkman:" > /dev/null 2>&1; then
groupadd -r sdkman
fi
usermod -a -G sdkman ${USERNAME}
umask 0002
# Install SDKMAN
curl -sSL "https://get.sdkman.io?rcupdate=false" | bash
chown -R :sdkman ${SDKMAN_DIR}
find ${SDKMAN_DIR} -type d | xargs -d '\n' chmod g+s
# Add sourcing of sdkman into bashrc/zshrc files (unless disabled)
updaterc "export SDKMAN_DIR=${SDKMAN_DIR}\n. \${SDKMAN_DIR}/bin/sdkman-init.sh"
fi
# Install gradle
sdk_install gradle ${GRADLE_VERSION} '\s\s' '\s\s' '^[0-9]+\.[0-9]+\.[0-9]+$'
updaterc '[ -z "${GRADLE_USER_HOME}" ] && export GRADLE_USER_HOME=${HOME}/.gradle'
echo "Done!"
src/jekyll/feature.json deleted 100644 → 0
View file @ 9611a036
{
"id": "jekyll",
"name": "Jekyll",
"options": {
"version": {
"type": "string",
"proposals": ["latest"],
"default": "latest",
"description": "Select or enter a version."
}
},
"install": {
"app": "",
"file": "install.sh"
}
}
src/jekyll/install.sh deleted 100644 → 0
View file @ 9611a036
#!/usr/bin/env bash
#-------------------------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------
#
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/hugo.md
# Maintainer: The VS Code and Codespaces Teams
#
# Syntax: ./jekyll-debian.sh [Jekyll version] [Non-root user] [Add rc files flag]
VERSION=${1:-"latest"}
USERNAME=${2:-"automatic"}
set -e
# If in automatic mode, determine if a user already exists, if not use codespace
if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
USERNAME=""
POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
for CURRENT_USER in ${POSSIBLE_USERS[@]}; do
if id -u ${CURRENT_USER} > /dev/null 2>&1; then
USERNAME=${CURRENT_USER}
break
fi
done
if [ "${USERNAME}" = "" ]; then
USERNAME=codespace
fi
elif [ "${USERNAME}" = "none" ]; then
USERNAME=root
USER_UID=0
USER_GID=0
fi
# Use sudo to run as non-root user is not already running
sudoUserIf()
{
if [ "$(id -u)" -eq 0 ] && [ "${USERNAME}" != "root" ]; then
sudo -u ${USERNAME} "$@"
else
"$@"
fi
}
# If we don't yet have Ruby installed, exit.
if ! /usr/local/rvm/rubies/default/bin/ruby --version > /dev/null ; then
echo "You need to install Ruby before installing Jekyll."
exit 1
fi
# If we don't already have Jekyll installed, install it now.
if ! jekyll --version > /dev/null ; then
echo "Installing Jekyll..."
if [ "${VERSION}" = "latest" ]; then
PATH="/usr/local/rvm/rubies/default/bin:${PATH}" /usr/local/rvm/rubies/default/bin/gem install jekyll
else
PATH="/usr/local/rvm/rubies/default/bin:${PATH}" /usr/local/rvm/rubies/default/bin/gem install jekyll -v "${VERSION}"
fi
fi
src/jupyterlab/install.sh
View file @ 54bb1d4e
...@@ -9,13 +9,18 @@ ...@@ -9,13 +9,18 @@
# #
# Syntax: ./jupyter-debian.sh # Syntax: ./jupyter-debian.sh
set -e set -ex
VERSION=${1:-"latest"} VERSION=${1:-"latest"}
USERNAME=${2:-"automatic"} USERNAME=${2:-"automatic"}
PYTHON=${3:-"python"} PYTHON=${3:-"python"}
ALLOW_ALL_ORIGINS=${4:-""} ALLOW_ALL_ORIGINS=${4:-""}
if [ "$(id -u)" -ne 0 ]; then
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
exit 1
fi
# If in automatic mode, determine if a user already exists, if not use vscode # If in automatic mode, determine if a user already exists, if not use vscode
if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
USERNAME="" USERNAME=""
...@@ -35,22 +40,13 @@ elif [ "${USERNAME}" = "none" ]; then ...@@ -35,22 +40,13 @@ elif [ "${USERNAME}" = "none" ]; then
USER_GID=0 USER_GID=0
fi fi
# Make sure we run the command as non-root user
sudoUserIf() {
if [ "$(id -u)" -eq 0 ] && [ "${USERNAME}" != "root" ]; then
sudo -u ${USERNAME} "$@"
else
"$@"
fi
}
addToJupyterConfig() { addToJupyterConfig() {
JUPYTER_DIR="/home/${USERNAME}/.jupyter" JUPYTER_DIR="/home/${USERNAME}/.jupyter"
JUPYTER_CONFIG="${JUPYTER_DIR}/jupyter_notebook_config.py" JUPYTER_CONFIG="${JUPYTER_DIR}/jupyter_notebook_config.py"
# Make sure the config file exists # Make sure the config file exists
test -d ${JUPYTER_DIR} || sudoUserIf mkdir ${JUPYTER_DIR} test -d ${JUPYTER_DIR} || mkdir ${JUPYTER_DIR}
test -f ${JUPYTER_CONFIG} || sudoUserIf touch ${JUPYTER_CONFIG} test -f ${JUPYTER_CONFIG} || touch ${JUPYTER_CONFIG}
# Don't write the same line more than once # Don't write the same line more than once
grep -q ${1} ${JUPYTER_CONFIG} || echo ${1} >> ${JUPYTER_CONFIG} grep -q ${1} ${JUPYTER_CONFIG} || echo ${1} >> ${JUPYTER_CONFIG}
...@@ -65,9 +61,9 @@ fi ...@@ -65,9 +61,9 @@ fi
# pip skips installation if JupyterLab is already installed # pip skips installation if JupyterLab is already installed
echo "Installing JupyterLab..." echo "Installing JupyterLab..."
if [ "${VERSION}" = "latest" ]; then if [ "${VERSION}" = "latest" ]; then
sudoUserIf ${PYTHON} -m pip install jupyterlab --no-cache-dir ${PYTHON} -m pip install jupyterlab --no-cache-dir
else else
sudoUserIf ${PYTHON} -m pip install jupyterlab=="${VERSION}" --no-cache-dir ${PYTHON} -m pip install jupyterlab=="${VERSION}" --no-cache-dir
fi fi
if [ "${ALLOW_ALL_ORIGINS}" = 'true' ]; then if [ "${ALLOW_ALL_ORIGINS}" = 'true' ]; then
......
src/maven/feature.json deleted 100644 → 0
View file @ 9611a036
{
"id": "maven",
"name": "Maven (via SDKMAN!)",
"documentationURL": "https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/maven.md",
"options": {
"version": {
"type": "string",
"proposals": [
"latest",
"none",
"3.8",
"3.6",
"3.5"
],
"default": "latest",
"description": "Select or enter a Maven version to install"
}
},
"extensions": [
"vscjava.vscode-java-pack"
],
"containerEnv": {
"SDKMAN_DIR": "${SDKMAN_DIR:-\"/usr/local/sdkman\"}",
"PATH": "${SDKMAN_DIR}/bin:${SDKMAN_DIR}/candidates/maven/current/bin:${PATH}"
},
"install": {
"app": "",
"file": "install.sh"
}
}
\ No newline at end of file
src/maven/install.sh deleted 100644 → 0
View file @ 9611a036
#!/usr/bin/env bash
#-------------------------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------
#
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/maven.md
# Maintainer: The VS Code and Codespaces Teams
#
# Syntax: ./maven-debian.sh [maven version] [non-root user] [Update rc files flag]
MAVEN_VERSION=${1:-"latest"}
USERNAME=${2:-"automatic"}
UPDATE_RC=${3:-"true"}
export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"}
set -e
if [ "$(id -u)" -ne 0 ]; then
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
exit 1
fi
# Ensure that login shells get the correct path if the user updated the PATH using ENV.
rm -f /etc/profile.d/00-restore-env.sh
echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
chmod +x /etc/profile.d/00-restore-env.sh
# Determine the appropriate non-root user
if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
USERNAME=""
POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
for CURRENT_USER in ${POSSIBLE_USERS[@]}; do
if id -u ${CURRENT_USER} > /dev/null 2>&1; then
USERNAME=${CURRENT_USER}
break
fi
done
if [ "${USERNAME}" = "" ]; then
USERNAME=root
fi
elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
USERNAME=root
fi
updaterc() {
if [ "${UPDATE_RC}" = "true" ]; then
echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
echo -e "$1" >> /etc/bash.bashrc
fi
if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
echo -e "$1" >> /etc/zsh/zshrc
fi
fi
}
# Function to run apt-get if needed
apt_get_update_if_needed()
{
if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then
echo "Running apt-get update..."
apt-get update
else
echo "Skipping apt-get update."
fi
}
# Checks if packages are installed and installs them if not
check_packages() {
if ! dpkg -s "$@" > /dev/null 2>&1; then
apt_get_update_if_needed
apt-get -y install --no-install-recommends "$@"
fi
}
# Use SDKMAN to install something using a partial version match
sdk_install() {
local install_type=$1
local requested_version=$2
local prefix=$3
local suffix="${4:-"\\s*"}"
local full_version_check=${5:-".*-[a-z]+"}
if [ "${requested_version}" = "none" ]; then return; fi
# Blank will install latest stable version
if [ "${requested_version}" = "lts" ] || [ "${requested_version}" = "default" ]; then
requested_version=""
elif echo "${requested_version}" | grep -oE "${full_version_check}" > /dev/null 2>&1; then
echo "${requested_version}"
else
local regex="${prefix}\\K[0-9]+\\.[0-9]+\\.[0-9]+${suffix}"
local version_list="$(. ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} 2>&1 | grep -oP "${regex}" | tr -d ' ' | sort -rV)"
if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ]; then
requested_version="$(echo "${version_list}" | head -n 1)"
else
set +e
requested_version="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
set -e
fi
if [ -z "${requested_version}" ] || ! echo "${version_list}" | grep "^${requested_version//./\\.}$" > /dev/null 2>&1; then
echo -e "Version $2 not found. Available versions:\n${version_list}" >&2
exit 1
fi
fi
su ${USERNAME} -c "umask 0002 && . ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk install ${install_type} ${requested_version} && sdk flush archives && sdk flush temp"
}
export DEBIAN_FRONTEND=noninteractive
# Install dependencies
check_packages curl ca-certificates zip unzip sed
# Install sdkman if not installed
if [ ! -d "${SDKMAN_DIR}" ]; then
# Create sdkman group, dir, and set sticky bit
if ! cat /etc/group | grep -e "^sdkman:" > /dev/null 2>&1; then
groupadd -r sdkman
fi
usermod -a -G sdkman ${USERNAME}
umask 0002
# Install SDKMAN
curl -sSL "https://get.sdkman.io?rcupdate=false" | bash
chown -R :sdkman ${SDKMAN_DIR}
find ${SDKMAN_DIR} -type d | xargs -d '\n' chmod g+s
# Add sourcing of sdkman into bashrc/zshrc files (unless disabled)
updaterc "export SDKMAN_DIR=${SDKMAN_DIR}\n. \${SDKMAN_DIR}/bin/sdkman-init.sh"
fi
# Install Maven
sdk_install maven ${MAVEN_VERSION} '\s\s' '\s\s' '^[0-9]+\.[0-9]+\.[0-9]+$'
updaterc '[ -z "$M2" ] && export M2=$HOME/.m2'
echo "Done!"
\ No newline at end of file
test/gradle/test.sh deleted 100644 → 0
View file @ 9611a036
#!/bin/bash
set -e
# Optional: Import test library
source dev-container-features-test-lib
# Definition specific tests
check "version" gradle --version
# Report result
reportResults
\ No newline at end of file
test/maven/test.sh deleted 100644 → 0
View file @ 9611a036
#!/bin/bash
set -e
# Optional: Import test library
source dev-container-features-test-lib
# Definition specific tests
check "version" mvn --version
# Report result
reportResults
\ No newline at end of file
test/ruby/test.sh
View file @ 54bb1d4e
...@@ -6,7 +6,8 @@ set -e ...@@ -6,7 +6,8 @@ set -e
source dev-container-features-test-lib source dev-container-features-test-lib
# Definition specific tests # Definition specific tests
check "version" ruby --version check "ruby version" ruby --version
check "gem version" gem --version
# Report result # Report result
reportResults reportResults
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment