From 4ff160a96e42bf87a0dbe0ccb26bb9b64ba2205b Mon Sep 17 00:00:00 2001 From: Robin Mordasiewicz Date: Sun, 6 Oct 2024 13:51:29 -0400 Subject: [PATCH] adding lower thirds --- .../.devcontainer/devcontainer.json | 64 +++++++++++++++++-- src/devcontainer/NOTES.md | 11 ++-- src/devcontainer/README.md | 13 ++-- src/devcontainer/devcontainer-template.json | 6 +- 4 files changed, 75 insertions(+), 19 deletions(-) diff --git a/src/devcontainer/.devcontainer/devcontainer.json b/src/devcontainer/.devcontainer/devcontainer.json index ca3d3bf..2ba0bb5 100644 --- a/src/devcontainer/.devcontainer/devcontainer.json +++ b/src/devcontainer/.devcontainer/devcontainer.json @@ -52,7 +52,13 @@ "ansible", "ansible-creator", "ansible-dev-environment", - "oterm" + "oterm", + "fastapi", + "uvicorn", + "pydantic", + "google-api-python-client", + "oauth2client", + "progressbar2" ] }, "ghcr.io/amerintlxperts/devcontainer-features/ansible-galaxy": { @@ -70,6 +76,7 @@ "ghcr.io/amerintlxperts/devcontainer-features/azure-cli-persistence": {}, "ghcr.io/amerintlxperts/devcontainer-features/container-dotfiles": {}, "ghcr.io/amerintlxperts/devcontainer-features/continue": {}, + "ghcr.io/amerintlxperts/devcontainer-features/draw.io": {}, "ghcr.io/amerintlxperts/devcontainer-features/fortidevsec": {}, "ghcr.io/amerintlxperts/devcontainer-features/infracost": {}, "ghcr.io/amerintlxperts/devcontainer-features/krew": {}, @@ -82,6 +89,7 @@ "ghcr.io/amerintlxperts/devcontainer-features/npm-globals": { "extensions": [ "bash-language-server", + "cwebp", "dockerfile-language-server-nodejs", "eslint", "eslint-config-prettier", @@ -90,9 +98,11 @@ "jsonlint", "newman", "prettier", + "puppeteer", "setup-eslint-config", "sql-language-server", "stylelint-config-prettier", + "svgo", "unified-language-server", "vscode-css-languageserver-bin", "vscode-html-languageserver-bin", @@ -101,6 +111,7 @@ ] }, "ghcr.io/amerintlxperts/devcontainer-features/nvidia-cuda": { + "cudaVersion": "12.6", "driverVersion": "550", "installToolkit": true }, @@ -108,7 +119,7 @@ "ghcr.io/amerintlxperts/devcontainer-features/opencommit": {}, "ghcr.io/amerintlxperts/devcontainer-features/speedtest": {}, "ghcr.io/amerintlxperts/devcontainer-features/tflint": {}, - "ghcr.io/amerintlxperts/devcontainer-features/update-conda": {}, + "ghcr.io/amerintlxperts/devcontainer-features/ubuntu-restricted-extras": {}, "ghcr.io/amerintlxperts/devcontainer-features/vimrc": {}, "ghcr.io/amerintlxperts/devcontainer-features/yq": {}, "ghcr.io/amerintlxperts/devcontainer-features/zzz-preinstall-extensions": { @@ -157,6 +168,7 @@ "mtxr.sqltools", "mtxr.sqltools-driver-pg", "nhoizey.gremlins", + "nitayneeman.puppeteer-snippets", "omartawfik.github-actions-vscode", "postman.postman-for-vscode", "redhat.ansible", @@ -176,23 +188,62 @@ "ghcr.io/devcontainers-contrib/features/actionlint": {}, "ghcr.io/devcontainers-contrib/features/apt-packages": { "packages": [ + "alsa-utils", + "libappindicator3-1", + "libdbusmenu-glib4", + "libdbusmenu-gtk3-4", + "libgl1-mesa-dri", + "libgl1-mesa-glx", + "libglx-mesa0", + "libvulkan1", + "mesa-utils", + "mesa-utils-bin", + "mesa-vulkan-drivers", "autoconf", + "apparmor", + "asciidoctor", "bash-completion", + "bat", "cmake", "dnsutils", "dos2unix", "file", + "fuse3", "graphviz", + "libavif-dev", + "libfuse3-3", "libgstreamer1.0-0", + "libnotify4", "gstreamer1.0-plugins-base", "gstreamer1.0-plugins-good", "gstreamer1.0-plugins-bad", "gstreamer1.0-plugins-ugly", + "imagemagick", + "inkscape", "iputils-ping", + "libfuse2", "libgif-dev", "libpoppler-cpp-dev", "libsecret-1-dev", "libyelp-dev", + "melt", + "frei0r-plugins", + "libgavl2", + "sox", + "libglu1-mesa", + "ladspa-sdk", + "libmovit-dev", + "libvidstab-dev", + "libsox-fmt-all", + "ladspa-sdk", + "libfftw3-bin", + "libfftw3-dev", + "libfftw3-long3", + "libfftw3-quad3", + "libfftw3-single3", + "snapd", + "squashfs-tools", + "swh-plugins", "mtr", "nmap", "software-properties-common", @@ -200,7 +251,9 @@ "tesseract-ocr", "tofrodos", "ubuntu-drivers-common", - "yelp-tools" + "vlc", + "yelp-tools", + "xdg-utils" ] }, "ghcr.io/devcontainers-contrib/features/argo-cd": {}, @@ -233,6 +286,7 @@ "omzPlugins": "https://github.com/zsh-users/zsh-autosuggestions.git https://github.com/zsh-users/zsh-syntax-highlighting.git https://github.com/conda-incubator/conda-zsh-completion.git https://github.com/z-shell/zsh-eza.git https://github.com/cda0/zsh-tfenv.git https://github.com/yuhonas/zsh-aliases-lsd.git", "plugins": "zsh-syntax-highlighting zsh-autosuggestions zsh-interactive-cd ubuntu jsontools gh common-aliases zsh-aliases-lsd zsh-tfenv conda-zsh-completion z pip terraform fluxcd azure git-auto-fetch helm istioctl iterm2 kube-ps1 kubectl sudo vscode aws fzf" }, + "ghcr.io/devcontainers/features/anaconda": {}, "ghcr.io/devcontainers/features/aws-cli": {}, "ghcr.io/devcontainers/features/azure-cli": { "extensions": "account,interactive", @@ -253,7 +307,7 @@ "ghcr.io/devcontainers/features/hugo": {}, "ghcr.io/devcontainers/features/node": {}, "ghcr.io/devcontainers/features/powershell": { - "powershellProfileURL": "https://raw.githubusercontent.com/robinmordasiewicz/dotfiles/main/Microsoft.PowerShell_profile.ps1", + "powershellProfileURL": "https://raw.githubusercontent.com/amerintlxperts/dotfiles/main/Microsoft.PowerShell_profile.ps1", "version": "7.4.2" }, "ghcr.io/devcontainers/features/python": { @@ -277,12 +331,12 @@ }, "ghcr.io/jsburckhardt/devcontainer-features/gitleaks": {}, "ghcr.io/jungaretti/features/make": {}, + "ghcr.io/kreemer/features/chrometesting": {}, "ghcr.io/lukewiwa/features/shellcheck": {}, "ghcr.io/prulloac/devcontainer-features/gitlint": {}, "ghcr.io/prulloac/devcontainer-features/ollama": {}, "ghcr.io/prulloac/devcontainer-features/pre-commit": {}, "ghcr.io/rio/features/kustomize": {}, - "ghcr.io/rocker-org/devcontainer-features/miniforge": {}, "ghcr.io/stuartleeks/dev-container-features/shell-history": {}, "ghcr.io/warrenbuckley/codespace-features/sqlite": {} }, diff --git a/src/devcontainer/NOTES.md b/src/devcontainer/NOTES.md index 2693699..7c7793c 100644 --- a/src/devcontainer/NOTES.md +++ b/src/devcontainer/NOTES.md @@ -12,9 +12,10 @@ mkdir .devcontainer ```json { - "name": "devcontainer", - "image": "ghcr.io/amerintlxperts2024/devcontainer:latest", - "initializeCommand": "docker pull ghcr.io/amerintlxperts2024/devcontainer:latest" + "name": "devops-toolkit", + "image": "ghcr.io/robinmordasiewicz/devcontainer:latest", + "initializeCommand": "docker pull ghcr.io/robinmordasiewicz/devcontainer:latest", + "runArgs": ["--name=devcontainer", "--hostname=devcontainer"] } ``` @@ -108,12 +109,12 @@ You find the setting Use containerd for pulling and storing images in Docker Des [Docker Desktop Mac](./docker-desktop-settings.png) ```bash -devcontainer build --workspace-folder . --platform linux/arm64,linux/amd64 --image-name ghcr.io/amerintlxperts2024/devcontainer:latest --output type=docker --no-cache true +devcontainer build --workspace-folder . --platform linux/arm64,linux/amd64 --image-name ghcr.io/robinmordasiewicz/devcontainer:latest --output type=docker --no-cache true ``` ### Authenticate to your container registry github/docker/azure and push the image ```bash docker login -docker push ghcr.io/amerintlxperts2024/devcontainer:latest +docker push ghcr.io/robinmordasiewicz/devcontainer:latest ``` diff --git a/src/devcontainer/README.md b/src/devcontainer/README.md index 0c9a8b6..e8b9d52 100644 --- a/src/devcontainer/README.md +++ b/src/devcontainer/README.md @@ -23,9 +23,10 @@ mkdir .devcontainer ```json { - "name": "devcontainer", - "image": "ghcr.io/amerintlxperts2024/devcontainer:latest", - "initializeCommand": "docker pull ghcr.io/amerintlxperts2024/devcontainer:latest" + "name": "devops-toolkit", + "image": "ghcr.io/robinmordasiewicz/devcontainer:latest", + "initializeCommand": "docker pull ghcr.io/robinmordasiewicz/devcontainer:latest", + "runArgs": ["--name=devcontainer", "--hostname=devcontainer"] } ``` @@ -119,17 +120,17 @@ You find the setting Use containerd for pulling and storing images in Docker Des [Docker Desktop Mac](./docker-desktop-settings.png) ```bash -devcontainer build --workspace-folder . --platform linux/arm64,linux/amd64 --image-name ghcr.io/amerintlxperts2024/devcontainer:latest --output type=docker --no-cache true +devcontainer build --workspace-folder . --platform linux/arm64,linux/amd64 --image-name ghcr.io/robinmordasiewicz/devcontainer:latest --output type=docker --no-cache true ``` ### Authenticate to your container registry github/docker/azure and push the image ```bash docker login -docker push ghcr.io/amerintlxperts2024/devcontainer:latest +docker push ghcr.io/robinmordasiewicz/devcontainer:latest ``` --- -_Note: This file was auto-generated from the [devcontainer-template.json](https://github.com/amerintlxperts2024/devcontainers/blob/main/src/devcontainer/devcontainer-template.json). Add additional notes to a `NOTES.md`._ +_Note: This file was auto-generated from the [devcontainer-template.json](https://github.com/robinmordasiewicz/templates/blob/main/src/devcontainer/devcontainer-template.json). Add additional notes to a `NOTES.md`._ diff --git a/src/devcontainer/devcontainer-template.json b/src/devcontainer/devcontainer-template.json index 8e850cb..bc4efcf 100644 --- a/src/devcontainer/devcontainer-template.json +++ b/src/devcontainer/devcontainer-template.json @@ -1,8 +1,8 @@ { "description": "devcontainer", - "documentationURL": "https://github.com/amerintlxperts/devcontainers/tree/main/src/devcontainer", + "documentationURL": "https://github.com/robinmordasiewicz/templates/tree/main/src/devcontainer", "id": "devcontainer", - "licenseURL": "https://github.com/amerintlxperts/devcontainers/blob/main/LICENSE", + "licenseURL": "https://github.com/robinmordasiewicz/templates/blob/main/LICENSE", "name": "devcontainer", "options": { "imageVariant": { @@ -18,5 +18,5 @@ "linux/amd64", "linux/arm64" ], - "version": "0.0.22" + "version": "0.2.5" }