From f2446d4cd0287c2459ce533574b68644379e5328 Mon Sep 17 00:00:00 2001 From: Kat Morgan Date: Sun, 28 Jan 2024 21:21:01 -0800 Subject: [PATCH] update gitignore for cleanliness --- .devcontainer/Dockerfile | 1 + .devcontainer/README.md | 5 + .devcontainer/devcontainer.json | 650 ++++++++++++------------ .devcontainer/science/devcontainer.json | 115 ++--- .github/konductor | 2 +- .gitignore | 1 + Makefile | 4 +- 7 files changed, 384 insertions(+), 394 deletions(-) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/README.md diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..3e21d7d --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1 @@ +FROM ghcr.io/containercraft/konductor:latest diff --git a/.devcontainer/README.md b/.devcontainer/README.md new file mode 100644 index 0000000..a070683 --- /dev/null +++ b/.devcontainer/README.md @@ -0,0 +1,5 @@ +# EDITS MAY BE OVERWRITTEN + +This directory is coppied from the .github/konductor/.github/devcontainer source +directory. Manual edits and changes may be overwritten by the `make konductor` +Makefile target. Be careful of it's use. diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3a4cfac..4805b53 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,329 +1,331 @@ -// Reference: -// - https://containers.dev/features -// - https://containers.dev/implementors/features -// - https://containers.dev/implementors/json_reference -// -// This reference has all json properties and their descriptions: -// - https://code.visualstudio.com/docs/getstarted/settings -// -// Discarded Opts for tracking: -// - "workbench.tree.renderIndentGuides": "always", { - "name": "konductor", - "dockerFile": "../.github/docker/Dockerfile", - "workspaceFolder": "/home/vscode/Kargo", - "workspaceMount": "source=.,target=/home/vscode/Kargo,type=bind,consistency=cached", - "shutdownAction": "stopContainer", - "customizations": { - "vscode": { - "telemetry.enableTelemetry": "off", - "workbench.action.terminal.focusNext": { - "key": "ctrl+shift+down", - "mac": "cmd+shift+down" - }, - "extensions": [ - "golang.go", - "vscodevim.vim", - "github.copilot", - "vscodevim.vim", - "max-ss.cyberpunk", - "ms-python.python", - "redhat.vscode-yaml", - "esbenp.prettier-vscode", - "oderwat.indent-rainbow", - "okteto.kubernetes-context", - "ms-vsliveshare.vsliveshare", - "ms-azuretools.vscode-docker", - "github.vscode-github-actions", - "ms-kubernetes-tools.kind-vscode", - "ms-vscode.vscode-typescript-next", - "github.vscode-pull-request-github", - "ms-vscode-remote.remote-containers", - "bierner.markdown-preview-github-styles", - "visualstudioexptteam.vscodeintellicode", - "ms-kubernetes-tools.vscode-kubernetes-tools", - "matt-rudge.auto-open-preview-panel", - "chadonsom.auto-view-readme" - ], - "extensions.experimental.affinity": { - "vscodevim.vim": 1 - }, - "settings": { - "remoteUser": "vscode", - "updateRemoteUserUID": true, - "editor": { - "tabCompletion": "on", - "autoClosingBrackets": "always", - "autoClosingQuotes": "always", - "autoImportCompletions": true, - "autoIndent": true, - "bracketPairColorization": { - "enabled": true - }, - "enablePreview": true, - "showTabs": true, - "showIcons": true, - "tabCloseButton": "right", - "tabSizing": "shrink", - "tabScrolling": "auto", - "tabDecoration": true, - "tabFocusMode": true, - "tabMovesFocus": false, - "tabHistoryNavigation": true, - "openPositioning": "right", - "closeOnFileDelete": true, - "restoreViewState": true, - "scrollBeyondLastLine": true, - "scrollbar": { - "alwaysConsumeMouseWheel": true - }, - "highlightModifiedTabs": true, - "highlightActiveIndentGuide": true, - "startupEditor": "readme", - "settings": { - "editor": "json" - }, - "tabSize": 2, - "fontSize": 14, - "wordWrap": "on", - "lineHeight": 20, - "formatOnSave": true, - "insertSpaces": true, - "lineNumbers": "relative", - "fontLigatures": true, - "minimap.enabled": false, - "renderWhitespace": "all", - "suggestSelection": "first", - "snippetSuggestions": "top", - "quickSuggestionsDelay": 50, - "inlineSuggest.enabled": true, - "parameterHints.enabled": true, - "trimTrailingWhitespace": true, - "fontFamily": "'FiraMono Nerd Font Mono', monospace", - "autoSave": "onFocusChange", - "gotoLocation": { - "multipleDefinitions": "goto", - "multipleDeclarations": "goto", - "multipleImplementations": "goto", - "multipleReferences": "goto", - "multipleTypeDefinitions": "goto" - } - }, - "vs-kubernetes": { - "vs-kubernetes.namespace": "", - "vs-kubernetes.kubectl-path": "/usr/local/bin/kubectl", - "vs-kubernetes.helm-path": "/usr/local/bin/helm", - "vs-kubernetes.outputFormat": "yaml", - "vs-kubernetes.kubeconfig": "/home/vscode/Kargo/.kube/config", - "vs-kubernetes.knownKubeconfigs": [ - "/home/vscode/Kargo/.kube/config", - "/home/vscode/.kube/config" - ] - }, - "vim": { - "disableExtension": true, - "cursorStylePerMode": { - "normal": "outline", - "insert": "block", - "replace": "block", - "visual": "underline", - "visualline": "underline", - "visualblock": "underline" - }, - "insertModeKeyBindings": [ - { - "before": [ - "j", - "j" - ], - "after": [ - "" - ] - } - ], - "handleKeys": { - "": false, - "": false - }, - "useSystemClipboard": true, - "useCtrlKeys": true, - "easymotion": true, - "incsearch": true, - "hlsearch": true - }, - "go": { - "formatTool": "goimports", - "formatFlags": [ - "-local", - "github.com/konductor" - ], - "buildOnSave": "off", - "vetOnSave": "off", - "lintOnSave": "off", - "testOnSave": "off", - "generateTestsFlags": [ - "-count=1" - ], - "testEnvVars": { - "GOFLAGS": "-count=1" - }, - "testTags": "all", - "buildTags": "all" - }, - "terminal": { - "integrated": { - // Cannot CWD in a bind mount with a relative path - // Accomodate for this by setting the CWD to $HOME as the workspace root - //"cwd": "/home/vscode/Kargo", - "cwd": "/home/vscode/", - "hideOnStartup": false, - "copyOnSelection": true, - "fontFamily": "FiraMono Nerd Font Mono", - "fontSize": 14, - "scrollback": 10000, - "cursorBlinking": true, - "cursorStyle": "outline", - "cursorStyleInactive": "line", - "sendKeybindingsToShell": false, - "commandsToSkipShell": [], - "scrollbar": { - "alwaysConsumeMouseWheel": true + "name": "konductor", + "remoteUser": "vscode", + "dockerFile": "Dockerfile", + "init": true, + "privileged": true, + "overrideCommand": false, + "updateRemoteUserUID": true, + //"workspaceFolder": "/workspaces/konductor", + "shutdownAction": "stopContainer", + "securityOpt": ["seccomp=unconfined"], + "runArgs": ["--network=host"], + "mounts": ["source=dind-var-lib-docker,target=/var/lib/docker,type=volume"], + "features": {"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}}, + "postCreateCommand": "devcontainer-links", + //"workspaceMount": "source=.,target=/home/vscode/konductor,type=bind,consistency=cached", + //"workspaceFolder": "/home/vscode/konductor", + "forwardPorts": [1313, 2222, 6000, 7681, 8080], + "customizations": { + "vscode": { + "settings": { + "telemetry.enableTelemetry": "off", + "initializeCommand": "echo 'Initializing...'", + "postCreateCommand": "echo 'Post create...'", + "postStartCommand": "echo 'Post start...'", + "postAttachCommand": "echo 'Post attach...'", + "window": { + "titleBarStyle": "custom", + "title": "${localWorkspaceFolderBasename}${separator}${containerName}${separator}${profileName}${separator}${activeEditorShort}" + }, + "search": { + "defaultViewMode": "list" + }, + "vim": { + "disableExtension": false, + "useSystemClipboard": true, + "useCtrlKeys": true, + "easymotion": true, + "incsearch": true, + "hlsearch": true, + "cursorStylePerMode": { + "normal": "block", + "insert": "line", + "visual": "underline", + "visualline": "underline", + "visualblock": "underline", + "replace": "block" + }, + "insertModeKeyBindings": [ + { + "before": [ + "j", + "j" + ], + "after": [ + "" + ] + } + ], + "handleKeys": { + "": false, + "": false + } + }, + "extensions.experimental.affinity": { + "vscodevim.vim": 1 + }, + "zenmode": { + "toggle": true, + "hideTabs": true, + "fullScreen": true, + "hideMinimap": true, + "centerLayout": false, + "hideStatusBar": true, + "hideActivityBar": true, + "hideLineNumbers": false, + "silentNotifications": true, + "hideLineDecorations": false, + "hideCursorInOverviewRuler": true + }, + "editor": { + "tabSize": 2, + "fontSize": 14, + "autoSave": "onFocusChange", + "wordWrap": "on", + "showTabs": true, + "showIcons": true, + "tabSizing": "shrink", + "lineHeight": 20, + "autoIndent": true, + "lineNumbers": "relative", + "formatOnSave": true, + "insertSpaces": true, + "tabScrolling": "auto", + //"tabFocusMode": false, + //"tabMovesFocus": false, + "tabCompletion": "on", + "tabDecoration": true, + "fontLigatures": true, + "enablePreview": true, + "startupEditor": "readme", + "tabCloseButton": "right", + "minimap.enabled": false, + "openPositioning": "right", + "restoreViewState": true, + "renderWhitespace": "all", + "suggestSelection": "first", + "closeOnFileDelete": true, + "autoClosingQuotes": "always", + "snippetSuggestions": "top", + "autoClosingBrackets": "always", + "tabHistoryNavigation": true, + "quickSuggestionsDelay": 50, + "autoImportCompletions": true, + "scrollBeyondLastLine": true, + "highlightModifiedTabs": true, + "inlineSuggest.enabled": true, + "parameterHints.enabled": true, + "trimTrailingWhitespace": true, + "lineHighlightBackground": "#30BFBF", + "highlightActiveIndentGuide": true, + "fontFamily": "'FiraMono Nerd Font Mono', monospace", + "gotoLocation": { + "multipleReferences": "goto", + "multipleDefinitions": "goto", + "multipleDeclarations": "goto", + "multipleImplementations": "goto", + "multipleTypeDefinitions": "goto" + }, + "scrollbar": { + "alwaysConsumeMouseWheel": true + }, + "bracketPairColorization": { + "enabled": true + } + }, + "files": { + "encoding": "utf8", + "autoSave": "onFocusChange", + "trimFinalNewlines": true, + "insertFinalNewline": true, + "trimTrailingWhitespace": true + }, + "git": { + "enabled": true, + "autofetch": true, + "autoStash": true, + "autorefresh": true, + "gitProtocol": "https", + "ignoreSubmodules": true, + "enableSmartCommit": true, + "ignoreLegacyWarning": true, + "autoRepositoryDetection": "openEditors", + "defaultCloneParentDirectory": "/home/vscode", + "scanRepositories": [ + "/home/vscode", + "/home/vscode/konductor", + "/home/vscode/konductor/.github/devcontainer", + "/workspaces" + ], + "path": "/usr/local/bin/git" + }, + "go": { + "testTags": "all", + "vetOnSave": "off", + "buildTags": "all", + "lintOnSave": "off", + "testOnSave": "off", + "buildOnSave": "off", + "formatTool": "goimports", + "testEnvVars": { + "GOFLAGS": "-count=1" + }, + "generateTestsFlags": [ + "-count=1" + ] + }, + "terminal": { + "integrated": { + //"cwd": "/home/vscode/Konductor", + "fontSize": 14, + "scrollback": 10000, + "cursorStyle": "outline", + "hideOnStartup": false, + "cursorBlinking": true, + "copyOnSelection": true, + "sendKeybindingsToShell": false, + "cursorStyleInactive": "line", + "fontFamily": "FiraMono Nerd Font Mono", + "commandsToSkipShell": [], + "scrollbar": { + "alwaysConsumeMouseWheel": true + }, + "shell": { + "linux": "/usr/bin/fish" + } + } + }, + "vs-kubernetes": { + "vs-kubernetes.namespace": "*", + "vs-kubernetes.outputFormat": "yaml", + "vs-kubernetes.helm-path": "/usr/local/bin/helm", + "vs-kubernetes.kubeconfig": "/home/vscode/.kube/config", + "vs-kubernetes.kubectl-path": "/usr/local/bin/kubectl", + "vs-kubernetes.knownKubeconfigs": [ + "/workspaces/*/.kube/config", + "/home/vscode/*/.kube/config", + "/home/vscode/.kube/config" + ] + }, + "remote": { + "restoreForwardedPorts": true, + "localPortHost": "127.0.0.1" + }, + "2gua.rainbow-brackets": true, + "indentRainbow": { + "indicatorStyle": "light", + "colorOnWhiteSpaceOnly": true, + "lightIndicatorStyleLineWidth": 12, + "ignoreEmptyLines": true, + "errorColor": "rgba(255, 20, 147, 0.3)", // Bright Pink for errors + "tabmixColor": "rgba(128, 32, 96, 0.3)", // Purple for mixed tabs and spaces + "colors": [ + "rgba(50, 150, 250, 0.1)", // Bright Blue + "rgba(200, 50, 250, 0.1)", // Purple + "rgba(50, 250, 150, 0.1)", // Neon Green + "rgba(250, 50, 150, 0.1)", // Pink + "rgba(50, 200, 250, 0.1)", // Lighter Blue + "rgba(150, 50, 250, 0.1)", // Darker Purple + "rgba(50, 250, 200, 0.1)", // Brighter Green + "rgba(250, 150, 50, 0.1)" // Orange + ], + "ignoreErrorLanguages": [ + "haskell", + "markdown", + "plaintext", + "shellscript", + "dockerfile", + "plaintext" + ] + }, + "workbench": { + "colorTheme": "Cyberpunk", + "startupEditor": "readme", + "action.terminal.focusNext": { + "key": "ctrl+shift+down", + "mac": "cmd+shift+down" + } + }, + "autoOpenPreviewPanel.openPreviewToTheSide": false, + "explorer.openEditors.visible": 1, + "explorer": { + "openEditors": { + "visible": 1 + }, + "autoRevealExclude": { + "**/.git/objects/**": true, + "**/.git/subtree-cache/**": true, + "**/node_modules/**": true + }, + "autoReveal": true, + "sortOrder": "filesFirst" + } }, - "shell": { - "linux": "/usr/bin/fish" - } - } - }, - "files": { - "trimTrailingWhitespace": true, - "trimFinalNewlines": true, - "insertFinalNewline": true, - "autoSave": "onFocusChange", - "encoding": "utf8" - }, - "zenmode": { - "silentNotifications": true, - "fullScreen": true, - "centerLayout": false, - "hideTabs": true, - "hideStatusBar": true, - "hideActivityBar": true, - "hideLineNumbers": false, - "hideLineDecorations": false, - "hideCursorInOverviewRuler": true, - "hideMinimap": true, - "toggle": true - }, - "colorTheme": "Cyberpunk", - "explorer": { - "openEditors": { - "visible": 1 - }, - "autoRevealExclude": { - "**/.git/objects/**": true, - "**/.git/subtree-cache/**": true, - "**/node_modules/**": true - }, - "autoReveal": true, - "sortOrder": "filesFirst" - }, - "autoOpenPreviewPanel.openPreviewToTheSide": false, - "window": { - "titleBarStyle": "custom", - "title": "${dirty}${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}" - }, - "initializeCommand": "echo 'Initializing...'", - "postCreateCommand": "echo 'Post create...'", - "postStartCommand": "echo 'Post start...'", - "postAttachCommand": "echo 'Post attach...'", - "git": { - "enabled": true, - "autofetch": true, - "autoStash": true, - "autorefresh": true, - "gitProtocol": "https", - "ignoreSubmodules": true, - "enableSmartCommit": true, - "ignoreLegacyWarning": true, - "autoRepositoryDetection": "openEditors", - "defaultCloneParentDirectory": "/home/vscode", - "scanRepositories": [ - "/home/vscode", - "/home/vscode/Kargo", - "/home/vscode/Kargo/.github/devcontainer", - "/workspaces" - ], - "path": "/usr/local/bin/git" - }, - "remote": { - "localPortHost": "127.0.0.1", - "restoreForwardedPorts": true - }, - "[makefile]": { - "editor.insertSpaces": false, - "editor.renderWhitespace": "selection" - }, - "[yaml]": { - "editor": { - "trimTrailingWhitespace": true, - "insertFinalNewline": true, - "wordWrap": "off", - "lineNumbers": "relative", - "renderWhitespace": "all", - "autoSave": "onFocusChange", - "formatOnSave": true, - "insertSpaces": true, - "tabSize": 2, - "minimap.enabled": true, - "scrollBeyondLastLine": true, - "scrollbar": { - "alwaysConsumeMouseWheel": true - } - } - }, - "[markdown]": { - "editor": { - "trimTrailingWhitespace": false, - "insertFinalNewline": true, - "wordWrap": "on", - "lineNumbers": "relative", - "renderWhitespace": "all", - "autoSave": "onFocusChange", - "formatOnSave": true, - "insertSpaces": true, - "tabSize": 4, - "minimap.enabled": false, - "scrollBeyondLastLine": true, - "scrollbar": { - "alwaysConsumeMouseWheel": true - } - } - }, - "search": { - "defaultViewMode": "list" + "[makefile]": { + "editor.insertSpaces": false, + "editor.renderWhitespace": "selection" + }, + "[yaml]": { + "editor": { + "trimTrailingWhitespace": true, + "insertFinalNewline": true, + "wordWrap": "off", + "lineNumbers": "relative", + "renderWhitespace": "all", + "autoSave": "onFocusChange", + "formatOnSave": true, + "insertSpaces": true, + "tabSize": 2, + "minimap.enabled": true, + "scrollBeyondLastLine": true, + "scrollbar": { + "alwaysConsumeMouseWheel": true + } + } + }, + "[markdown]": { + "editor": { + "tabSize": 4, + "wordWrap": "on", + "autoSave": "onFocusChange", + "lineNumbers": "relative", + "formatOnSave": true, + "insertSpaces": true, + "minimap.enabled": false, + "renderWhitespace": "all", + "insertFinalNewline": true, + "scrollBeyondLastLine": true, + "trimTrailingWhitespace": false, + "scrollbar": { + "alwaysConsumeMouseWheel": true + } + } + }, + "extensions": [ + "golang.go", + "vscodevim.vim", + "github.copilot", + "max-ss.cyberpunk", + "ms-python.python", + "redhat.vscode-yaml", + "esbenp.prettier-vscode", + "oderwat.indent-rainbow", + "okteto.kubernetes-context", + "ms-vsliveshare.vsliveshare", + "chadonsom.auto-view-readme", + "ms-azuretools.vscode-docker", + "github.vscode-github-actions", + "ms-kubernetes-tools.kind-vscode", + "ms-vscode.vscode-typescript-next", + "github.vscode-pull-request-github", + "matt-rudge.auto-open-preview-panel", + "ms-vscode-remote.remote-containers", + "bierner.markdown-preview-github-styles", + "visualstudioexptteam.vscodeintellicode", + "bierner.markdown-preview-github-styles", + "ms-kubernetes-tools.vscode-kubernetes-tools" + ] } - } } - }, - "features": { - "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {} - }, - "remoteUser": "vscode", - "overrideCommand": false, - "forwardPorts": [ - 1313, - 2222, - 6000, - 7681, - 8080 - ], - "runArgs": [ - "--init", - "--privileged", - "--network=host" - ], - "postCreateCommand": "sudo chown $USER /workspaces/* 2>/dev/null || true; ln -s /workspaces/Kargo /home/vscode/Kargo || true; direnv allow 2>/dev/null || true", - "mounts": [ - "source=dind-var-lib-docker,target=/var/lib/docker,type=volume" - ] } diff --git a/.devcontainer/science/devcontainer.json b/.devcontainer/science/devcontainer.json index 60e11a9..884ccf8 100644 --- a/.devcontainer/science/devcontainer.json +++ b/.devcontainer/science/devcontainer.json @@ -1,84 +1,65 @@ { - "name": "science-konductor", + "name": "konductor-gpt", + "image": "ghcr.io/containercraft/konductor", "remoteUser": "vscode", - "dockerFile": "../.github/docker/Dockerfile", - "workspaceFolder": "/home/vscode/Kargo", - "workspaceMount": "source=.,target=/home/vscode/Kargo,type=bind,consistency=cached", - "shutdownAction": "stopContainer", + "forwardPorts": [1313, 2222, 6000, 7681, 8080], + "postCreateCommand": "direnv allow 2>/dev/null || true; tmux list-sessions 2>/dev/null || true", + "mounts": ["source=dind-var-lib-docker,target=/var/lib/docker,type=volume"], + "runArgs": ["--init", "--privileged", "--network=host"], + "overrideCommand": false, + "features": { + "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {} + }, "customizations": { "vscode": { "settings": { - "editor": { - "lineNumbers": "on", - "fontSize": 14, - "fontLigatures": true, - "fontFamily": "FiraMono Nerd Font Mono", - "wordWrap": "on", - "tabSize": 2, - "insertSpaces": true, - "autoIndent": true, - "formatOnSave": true, - "autoSave": "onFocusChange", - "trimTrailingWhitespace": true, - "suggestSelection": "first", - "snippetSuggestions": "top", - "quickSuggestionsDelay": 100, - "parameterHints.enabled": true, - "renderWhitespace": "all", + "terminal.integrated.fontFamily": "FiraMono Nerd Font Mono", + "terminal.integrated.shell.linux": "/usr/bin/fish", + "terminal.integrated.shellArgs.linux": ["-c", "/usr/bin/connect"], + "workbench.colorTheme": "Dracula Soft", + "editor.minimap.enabled": false, + "editor.lineNumbers": "relative", + "editor.quickSuggestionsDelay": 0, + "editor.suggestSelection": "first", + "editor.snippetSuggestions": "top", + "editor.gotoLocation.multipleReferences": "goto", + "editor.gotoLocation.multipleDefinitions": "goto", + "editor.gotoLocation.multipleDeclarations": "goto", + "editor.gotoLocation.multipleImplementations": "goto", + "editor.gotoLocation.multipleTypeDefinitions": "goto", + "explorer.openEditors.visible": 1, + "files.trimTrailingWhitespace": true, + "files.trimFinalNewlines": true, + "python.analysis.autoSearchPaths": true, + "python.analysis.diagnosticSeverityOverrides": { + "reportMissingImports": "error" }, - "files.trimFinalNewlines": false, - "workbench.colorTheme": "Cyberpunk", - "workbench.editor.enablePreview": true, - "workbench.startupEditor": "readme", - "terminal": { - "integrated": { - "cwd": "/home/vscode/Kargo", - "fontFamily": "FiraMono Nerd Font Mono", - "fontSize": 14, - "scrollback": 10000, - "rendererType": "dom", - "cursorStyle": "line", - "cursorBlinking": true, - "sendKeybindingsToShell": true, - "scrollbar": { - "alwaysConsumeMouseWheel": false - }, - "shell": { - "linux": "/usr/bin/fish" - } - } - } + "python.linting.enabled": true, + "python.linting.pylintEnabled": true, + "python.formatting.autopep8Path": "autopep8", + "python.formatting.blackPath": "black", + "python.formatting.yapfPath": "yapf", + "eslint.alwaysShowStatus": true, + "eslint.format.enable": true, + "eslint.lintTask.enable": true, + "git.autofetch": true }, "extensions": [ "golang.go", - "vscodevim.vim", - "github.copilot", - "max-ss.cyberpunk", "ms-python.python", "redhat.vscode-yaml", "esbenp.prettier-vscode", - "chadonsom.auto-view-readme", - "ms-vsliveshare.vsliveshare", "ms-azuretools.vscode-docker", - "github.vscode-github-actions", - "ms-vscode.vscode-typescript-next", - "github.vscode-pull-request-github", - "matt-rudge.auto-open-preview-panel", "ms-vscode-remote.remote-containers", - "visualstudioexptteam.vscodeintellicode", - "bierner.markdown-preview-github-styles" + "ms-vscode.vscode-typescript-next", + "bierner.markdown-preview-github-styles", + "ms-vscode.cpptools-extension-pack", + "ms-vscode.cpptools", + "ms-vscode-remote.remote-ssh", + "eamodio.gitlens", + "dbaeumer.vscode-eslint", + "ms-kubernetes-tools.vscode-kubernetes-tools" ] } - }, - "features": { - "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {} - }, - "runArgs": ["--init", "--privileged", "--network=host"], - "forwardPorts": [1313, 2222, 6000, 7681, 8080], - "postCreateCommand": "sudo chown $USER /workspaces/* 2>/dev/null || true; direnv allow 2>/dev/null || true", - "mounts": [ - "source=dind-var-lib-docker,target=/var/lib/docker,type=volume", - "source=workspace-cache,target=/home/vscode/.cache,type=volume" - ], - "overrideCommand": false + } } diff --git a/.github/konductor b/.github/konductor index d0fc36e..0c8497c 160000 --- a/.github/konductor +++ b/.github/konductor @@ -1 +1 @@ -Subproject commit d0fc36e62a5aba82e4ffc1bf56d7234f6bc8afc9 +Subproject commit 0c8497ce46d7cf9878dfe8af795c5d4994e34090 diff --git a/.gitignore b/.gitignore index 9e515d7..9eb7e7e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ __pycache__/ .pulumi/* Pulumi.*.yaml .env +.devcontainer/docker diff --git a/Makefile b/Makefile index 76225c1..ce7eb0f 100644 --- a/Makefile +++ b/Makefile @@ -15,12 +15,12 @@ KUBE_CONFIG_FILE := ${PWD}/.kube/config # Check if PULUMI_ACCESS_TOKEN is set ifeq ($(ESCAPED_PAT),) -$(error PULUMI_ACCESS_TOKEN is not set) +$(warning PULUMI_ACCESS_TOKEN is not set) endif # Check if GITHUB_TOKEN is set ifeq ($(ESCAPED_GITHUB_TOKEN),) -$(error GITHUB_TOKEN is not set) +$(warning GITHUB_TOKEN is not set) endif # --- Targets ---