Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit 6f6108d

Browse files
joshspicerChuxel
andauthored
merge features.json exploration (#1009)
* Exploration * Modifications * Base dockerfile * Handle existing non-package manager install of git * Use central settings file if present * Version soft match, use central settings for keys * Features updates * Partial version number support, logic fixes * PPA option, partial version selection fixes * Use common utility functions to simplify * Update features * Minor edits * Script updates for lego blocks * Fix for latest * Test fix * Test fix * Common setting fix * Remove duplicate declaration * Support "lts" as a version * Add exclusions * Simplify node option in definitions * Install java 11 as well if java 8 installed * Fix to set +x * Change order to ensure JDK 8 is default if selected * Add missing type * Switch to an out, src folder, avoid env var conflicts * Ensure staging is in right folder. * Packaging tweaks * Text tweaks * Minor edits and comments * Fix * update features.json to use hint,capAdd,securityOpt Co-authored-by: Chuck Lantz <[email protected]> Co-authored-by: Chuck Lantz <[email protected]>
1 parent ca8fd24 commit 6f6108d

File tree

12 files changed

+599
-3
lines changed

12 files changed

+599
-3
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ Thumbs.db
88
*.tgz
99
**/.ionide
1010

11-
containers-readmes
11+
/manifests
12+
/containers-readmes
13+
/container-features
1214

1315
## Ignore Visual Studio temporary files, build results, and
1416
## files generated by popular Visual Studio add-ons.

build/config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
"filesToStage": [
2222
"+(containers|repository-containers)/**/!(test-project|history)/*",
23+
"script-library/**/*",
2324
"LICENSE",
2425
"package.json",
2526
"yarn.lock",

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
"containers",
1313
"containers-readmes",
1414
"repository-containers",
15-
"manifests"
15+
"manifests",
16+
"container-features"
1617
],
1718
"scripts": {
18-
"prepack": "rimraf containers-readmes manifests && copyfiles --up 1 containers/**/README.md containers-readmes && copyfiles --up 1 containers/**/definition-manifest.json manifests"
19+
"prepack": "rimraf containers-readmes manifests container-features && copyfiles --up 1 containers/**/README.md containers-readmes && copyfiles --up 1 containers/**/definition-manifest.json manifests && copyfiles --up 1 script-library/*.sh container-features && copyfiles --up 3 script-library/container-features/src/* container-features"
1920
},
2021
"devDependencies": {
2122
"copyfiles": "^2.1.1",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This folder includes some explorations around dynamic container feature injection. Nothing stable yet.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
ARG BASE_IMAGE=mcr.microsoft.com/vscode/devcontainers/base:buster
2+
FROM $BASE_IMAGE
3+
4+
USER root
5+
6+
COPY *.env *.sh /tmp/library-scripts/
7+
RUN /tmp/library-scripts/install.sh \
8+
&& rm -rf /tmp/library-scripts
9+
10+
#{containerEnv}
11+
12+
ARG IMAGE_USER=root
13+
USER $IMAGE_USER
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
_VSC_INSTALL_DOCKER_IN_DOCKER=docker-in-docker-debian.sh
2+
_VSC_INSTALL_DOCKER_FROM_DOCKER=docker-debian.sh
3+
_VSC_INSTALL_KUBECTL_HELM_MINIKUBE="kubectl-helm-debian.sh ${_VSC_KUBCTL_VERSION:-latest} ${_VSC_HELM_VERSION:-latest} ${_VSC_MINIKUBE_VERSION:-latest}"
4+
_VSC_INSTALL_TERRAFORM="terraform-debian.sh ${_VSC_TERRAFORM_VERSION:-latest} ${_VSC_TFLINT_VERSION:-latest} ${_VSC_TERRAGRUNT_VERSION:-latest}"
5+
_VSC_INSTALL_GIT="git-from-src-debian.sh latest true"
6+
_VSC_INSTALL_GIT_LFS=git-lfs-debian.sh
7+
_VSC_INSTALL_GITHUB_CLI=github-debian.sh
8+
_VSC_INSTALL_AZURE_CLI=azcli-debian.sh
9+
_VSC_INSTALL_SSH=sshd-debian.sh
10+
_VSC_INSTALL_HOMEBREW=homebrew-debian.sh
11+
_VSC_NODE_VERSION="node-debian.sh /usr/local/share/nvm ${_VSC_NODE_VERSION:-"lts/*"}"
12+
_VSC_PYTHON_VERSION="python-debian.sh ${_VSC_PYTHON_VERSION:-latest} /usr/local/python /usr/local/py-utils"
13+
_VSC_GOLANG_VERSION="go-debian.sh ${_VSC_GOLANG_VERSION:-latest}"
14+
_VSC_JAVA_VERSION="java-wrapper.sh ${_VSC_JAVA_VERSION:-latest}"
15+
_VSC_MAVEN_VERSION="maven-debian.sh ${_VSC_MAVEN_VERSION:-latest}"
16+
_VSC_GRADLE_VERSION="gradle-debian.sh ${_VSC_GRADLE_VERSION:-latest}"
17+
_VSC_RUBY_VERSION="ruby-debian.sh ${_VSC_RUBY_VERSION:-latest}"
18+
_VSC_INSTALL_RUST=rust-debian.sh
19+
_VSC_INSTALL_POWERSHELL=powershell-debian.sh
20+
_VSC_INSTALL_DESKTOP_LITE=desktop-lite-debian.sh

0 commit comments

Comments
 (0)