-
-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 26_elasticagent
- Loading branch information
Showing
97 changed files
with
4,157 additions
and
262 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
``` | ||
🍺 /usr/local/Cellar/sftpgo/2.5.3: 174 files, 50.3MB | ||
==> Running `brew cleanup sftpgo`... | ||
Removing: /usr/local/Cellar/sftpgo/2.5.2... (174 files, 50.2MB) | ||
==> Upgrading angular-cli | ||
16.1.1 -> 16.1.4 | ||
==> Pouring angular-cli--16.1.4.ventura.bottle.tar.gz | ||
🍺 /usr/local/Cellar/angular-cli/16.1.4: 6,965 files, 31.2MB | ||
==> Running `brew cleanup angular-cli`... | ||
Removing: /usr/local/Cellar/angular-cli/16.1.1... (6,970 files, 31.2MB) | ||
==> Upgrading docker-compose | ||
2.19.0 -> 2.19.1 | ||
==> Pouring docker-compose--2.19.1.ventura.bottle.tar.gz | ||
Error: The `brew link` step did not complete successfully | ||
The formula built, but is not symlinked into /usr/local | ||
Could not symlink bin/docker-compose | ||
Target /usr/local/bin/docker-compose | ||
already exists. You may want to remove it: | ||
rm '/usr/local/bin/docker-compose' | ||
To force the link and overwrite all conflicting files: | ||
brew link --overwrite docker-compose | ||
To list all files that would be deleted: | ||
brew link --overwrite --dry-run docker-compose | ||
Possible conflicting files are: | ||
/usr/local/bin/docker-compose -> /Applications/Docker.app/Contents/Resources/bin/docker-compose | ||
==> Caveats | ||
Compose is now a Docker plugin. For Docker to find this plugin, symlink it: | ||
mkdir -p ~/.docker/cli-plugins | ||
ln -sfn /usr/local/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,6 +17,8 @@ | |
* https://cliffy.io/[email protected] | ||
* https://github.com/gotify/server | ||
* https://github.com/typicode/lowdb | ||
* https://github.com/sindresorhus/execa | ||
* [Title](https://github.com/mde/ejs) | ||
|
||
## System | ||
|
||
|
@@ -61,6 +63,8 @@ | |
* https://uppy.io/docs/dashboard/ | ||
* https://unkey.dev/ | ||
* [Title](https://github.com/vercel-labs/ai-chatbot) | ||
* [Title](https://github.com/apostrophecms/apostrophe) | ||
* [Title](https://github.com/isomorphic-git/isomorphic-git) | ||
|
||
## Serverless | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{{- $cloudflareR2AccountId := (default "84fa0d1b16ff8086dd958c468ce7fd59" (env "CLOUDFLARE_R2_ID")) -}} | ||
{{- $cloudflareUsername := (default "[email protected]" (env "CLOUDFLARE_USERNAME")) -}} | ||
{{- $cloudflareTeamsOrg := (default "manhattan" (env "CLOUDFLARE_TEAMS_ORG")) -}} | ||
{{- $desktopSession := true -}} | ||
{{- $domain := (default "megabyte.space" (env "PUBLIC_SERVICES_DOMAIN")) -}} | ||
{{- $email := (default "[email protected]" (env "PRIMARY_EMAIL")) -}} | ||
|
@@ -127,6 +128,8 @@ gpg: | |
data: | ||
host: | ||
arch: "{{ .chezmoi.arch }}" | ||
cloudflare: | ||
teamsOrg: "{{ $cloudflareTeamsOrg }}" | ||
cpu: | ||
cores: "{{ $cpuCores }}" | ||
threads: "{{ $cpuThreads }}" | ||
|
@@ -141,6 +144,15 @@ data: | |
doRegion: nyc1 | ||
domain: "{{ $domain }}" | ||
elasticFleetServer: "https://elastic-fleet.{{ $PUBLIC_SERVICES_DOMAIN }}:8220" | ||
gitlabRunners: | ||
- glurl: "https://gitlab.com/" | ||
runnerDescription: "Docker executor" | ||
runnerImage: "alpine:latest" | ||
runnerTags: "alpine,linux" | ||
- glurl: "https://gitlab.com/" | ||
baseVM: "debian" | ||
runnerDescription: "VirtualBox executor - Debian, OpenJDK 20" | ||
runnerTags: "bash,openjdk20,linux" | ||
headless: {{ $headless }} | ||
home: "{{ .chezmoi.homeDir }}" | ||
homeParentFolder: "{{ if eq .chezmoi.os "linux" }}/home{{ else if eq .chezmoi.os "darwin" }}/Users{{ else }}C:\Users{{ end }}" | ||
|
@@ -172,7 +184,7 @@ data: | |
r2: "{{ $cloudflareR2AccountId }}" | ||
username: "{{ $cloudflareUsername }}" | ||
defaultBrowser: chrome | ||
defaultBrowserDarwin: browserosaurus | ||
defaultBrowserDarwin: chrome | ||
digitalOceanClusterId: b7fc4e37-ffe7-4ea1-887a-0e19ee077f32 | ||
# `domain` is kept here for backwards compatibility, but the .host.domain is the preferred selector | ||
domain: "{{ $domain }}" | ||
|
@@ -182,6 +194,9 @@ data: | |
email: "{{ $gcloudEmail }}" | ||
github: | ||
username: "{{ $githubUsername }}" | ||
gitomatic: | ||
- git: "{{ default "[email protected]:megabyte-labs/install.doctor.git" (env "START_REPO") }}" | ||
path: /usr/local/src/install.doctor | ||
gmail: | ||
username: "{{ $gmailAddress }}" | ||
gpg: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.