2cc93bebc62c5a3639073961c568db84a2963172
- Author
- Ayman Bagabas <ayman.bagabas@gmail.com>
- Committer
- Ayman Bagabas <ayman.bagabas@gmail.com>
- Date
Message
Rename smoothie -> soft-serve
Diff
This diff is truncated to protect this page.
1diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
2index 8d19c7a72735e8669e36496f62fca57d8c59f30c..739412dc4851c05d79ccce3233aaab00f2671a29 100644
3--- a/.github/workflows/cd.yml
4+++ b/.github/workflows/cd.yml
5@@ -20,7 +20,7 @@ jobs:
6 AWS_DEFAULT_REGION: us-east-1
7 AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
8 AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
9- SMOOTHIE_REPO_KEYS: "${{ secrets.SMOOTHIE_REPO_KEYS }}"
10+ SOFT_SERVE_REPO_KEYS: "${{ secrets.SOFT_SERVE_REPO_KEYS }}"
11
12 steps:
13 - name: Install Go
14@@ -78,7 +78,7 @@ jobs:
15 aws_region = "$AWS_DEFAULT_REGION"
16 app_image = "$CONTAINER_REPO:$GITHUB_SHA-snapshot"
17 authorization_keys = <<EOT
18- $SMOOTHIE_REPO_KEYS
19+ $SOFT_SERVE_REPO_KEYS
20 EOT
21 EOF
22 TF_VARS="-var-file=live.auto.tfvars"
23diff --git a/.gitignore b/.gitignore
24index 2ee7702b44ff48e73da1faf8a92fb5041644f837..afadd7767fc59b5be7cf7e842c28ebc8535e4d76 100644
25--- a/.gitignore
26+++ b/.gitignore
27@@ -1,4 +1,4 @@
28-smoothie
29+soft-serve
30 .ssh
31 .repos
32 dist
33diff --git a/.goreleaser.yml b/.goreleaser.yml
34index 4f79421e038c2a90a3b9259d70be2f23081dfeb0..005e159ce09fd7f59d455bb4b9099d4753eb96cc 100644
35--- a/.goreleaser.yml
36+++ b/.goreleaser.yml
37@@ -1,4 +1,4 @@
38-project_name: smoothie
39+project_name: soft-serve
40
41 env:
42 - GO111MODULE=on
43@@ -9,8 +9,8 @@ before:
44 - go mod download
45
46 builds:
47- - id: "smoothie"
48- binary: "smoothie"
49+ - id: "soft-serve"
50+ binary: "soft-serve"
51 ldflags: -s -w -X main.Version={{ .Commit }}-snapshot -X main.CommitSHA={{ .Commit }}
52 goos:
53 - linux
54@@ -19,16 +19,16 @@ builds:
55
56 dockers:
57 - image_templates:
58- - "ghcr.io/charmbracelet/smoothie-internal:snapshot"
59- - "ghcr.io/charmbracelet/smoothie-internal:{{ .Commit }}-snapshot"
60- ids: [smoothie]
61+ - "ghcr.io/charmbracelet/soft-serve-internal:snapshot"
62+ - "ghcr.io/charmbracelet/soft-serve-internal:{{ .Commit }}-snapshot"
63+ ids: [soft-serve]
64 goarch: amd64
65 build_flag_templates:
66 - --platform=linux/amd64
67 - --label=org.opencontainers.image.title={{ .ProjectName }}
68 - --label=org.opencontainers.image.description={{ .ProjectName }}
69- - --label=org.opencontainers.image.url=https://github.com/charmbracelet/smoothie-internal
70- - --label=org.opencontainers.image.source=https://github.com/charmbracelet/smoothie-internal
71+ - --label=org.opencontainers.image.url=https://github.com/charmbracelet/soft-serve-internal
72+ - --label=org.opencontainers.image.source=https://github.com/charmbracelet/soft-serve-internal
73 - --label=org.opencontainers.image.version={{ .Commit }}-snapshot
74 - --label=org.opencontainers.image.created={{ .Date }}
75 - --label=org.opencontainers.image.revision={{ .FullCommit }}
76diff --git a/Dockerfile b/Dockerfile
77index dfed51d2242994d08c4d94ac655fd57b4381f24b..447d7c4cdb52e0b47f0a7dcdc6dfb050900f1fed 100644
78--- a/Dockerfile
79+++ b/Dockerfile
80@@ -2,22 +2,22 @@ FROM alpine:latest
81
82 RUN apk update && apk add --update nfs-utils git && rm -rf /var/cache/apk/*
83
84-COPY smoothie /usr/local/bin/smoothie
85+COPY soft-serve /usr/local/bin/soft-serve
86
87 # Create directories
88-WORKDIR /smoothie
89+WORKDIR /soft-serve
90 # Expose data volume
91-VOLUME /smoothie
92+VOLUME /soft-serve
93
94 # Environment variables
95-ENV SMOOTHIE_KEY_PATH "/smoothie/ssh/smoothie_server_ed25519"
96-ENV SMOOTHIE_REPO_KEYS ""
97-ENV SMOOTHIE_REPO_KEYS_PATH "/smoothie/ssh/smoothie_git_authorized_keys"
98-ENV SMOOTHIE_REPO_PATH "/smoothie/repos"
99+ENV SOFT_SERVE_KEY_PATH "/soft-serve/ssh/soft_serve_server_ed25519"
100+ENV SOFT_SERVE_REPO_KEYS ""
101+ENV SOFT_SERVE_REPO_KEYS_PATH "/soft-serve/ssh/soft_serve_git_authorized_keys"
102+ENV SOFT_SERVE_REPO_PATH "/soft-serve/repos"
103
104 # Expose ports
105 # SSH
106 EXPOSE 23231/tcp
107
108 # Set the default command
109-ENTRYPOINT [ "/usr/local/bin/smoothie" ]
110+ENTRYPOINT [ "/usr/local/bin/soft-serve" ]
111diff --git a/README.md b/README.md
112index 00a5006c308e81a6d310067297672c89a2a5d07b..b2ff40a1715682cb016e017b99febabfa68e6654 100644
113--- a/README.md
114+++ b/README.md
115@@ -1,25 +1,25 @@
116-# Smoothie
117+# Soft-Serve
118
119 Distribute your software on the command line with SSH and Git.
120
121 ## What is it
122
123-Smoothie is a SSH server that hosts a Git server and interactive TUI built from
124-the repos you push to it. Authors can easily push their projects to Smoothie by
125-adding it as a remote and users can clone repos from Smoothie and stay up to
126+Soft-Serve is a SSH server that hosts a Git server and interactive TUI built from
127+the repos you push to it. Authors can easily push their projects to Soft-Serve by
128+adding it as a remote and users can clone repos from Soft-Serve and stay up to
129 date with the TUI as you push commits.
130
131 ## Pushing a repo
132
133-1. Run `smoothie`
134-2. Add smoothie as a remote on any git repo: `git remote add smoothie ssh://git@localhost:23231/smoothie`
135-3. Push stuff: `git push smoothie main`
136+1. Run `soft-serve`
137+2. Add soft-serve as a remote on any git repo: `git remote add soft-serve ssh://git@localhost:23231/soft-serve`
138+3. Push stuff: `git push soft-serve main`
139
140 ## Cloning a repo
141
142-1. You'll need to know the name (for now, it's not listed anywhere): `git clone ssh://git@localhost:23231/smoothie`
143+1. You'll need to know the name (for now, it's not listed anywhere): `git clone ssh://git@localhost:23231/soft-serve`
144
145-## Smoothie TUI
146+## Soft-Serve TUI
147
148 If you `ssh localhost -p 23231` you'll see a list of the latest commits to the repos you've pushed.
149
150@@ -28,4 +28,4 @@ If you `ssh localhost -p 23231` you'll see a list of the latest commits to the r
151 By default anyone can push or pull from the Git repositories. This is mainly
152 for testing, you can also whitelist public keys that have Git write access by
153 creating an authorized keys file with the public key for each author. By
154-default this file is expected to be at `./.ssh/smoothie_git_authorized_keys`.
155+default this file is expected to be at `./.ssh/soft_serve_git_authorized_keys`.
156diff --git a/go.mod b/go.mod
157index e3df4931fcf2e87e71f7faa7fe6749fe695bb689..4ec8a6b83088efeb2dd275ca196d0799df207177 100644
158--- a/go.mod
159+++ b/go.mod
160@@ -1,4 +1,4 @@
161-module smoothie
162+module soft-serve
163
164 go 1.16
165
166diff --git a/main.go b/main.go
167index c96174a789652f8672a753c6d161963857f3fd23..db24d054c0a7f3c5117f0193a7dbcde912522b68 100644
168--- a/main.go
169+++ b/main.go
170@@ -3,7 +3,7 @@ package main
171 import (
172 "fmt"
173 "log"
174- "smoothie/tui"
175+ "soft-serve/tui"
176 "time"
177
178 "github.com/charmbracelet/wish"
179@@ -15,12 +15,12 @@ import (
180 )
181
182 type Config struct {
183- Port int `env:"SMOOTHIE_PORT" default:"23231"`
184- Host string `env:"SMOOTHIE_HOST" default:""`
185- KeyPath string `env:"SMOOTHIE_KEY_PATH" default:".ssh/smoothie_server_ed25519"`
186- RepoAuth string `env:"SMOOTHIE_REPO_KEYS" default:""`
187- RepoAuthFile string `env:"SMOOTHIE_REPO_KEYS_PATH" default:".ssh/smoothie_git_authorized_keys"`
188- RepoPath string `env:"SMOOTHIE_REPO_PATH" default:".repos"`
189+ Port int `env:"SOFT_SERVE_PORT" default:"23231"`
190+ Host string `env:"SOFT_SERVE_HOST" default:""`
191+ KeyPath string `env:"SOFT_SERVE_KEY_PATH" default:".ssh/soft_serve_server_ed25519"`
192+ RepoAuth string `env:"SOFT_SERVE_REPO_KEYS" default:""`
193+ RepoAuthFile string `env:"SOFT_SERVE_REPO_KEYS_PATH" default:".ssh/soft_serve_git_authorized_keys"`
194+ RepoPath string `env:"SOFT_SERVE_REPO_PATH" default:".repos"`
195 }
196
197 func main() {
198diff --git a/main.tf b/main.tf
199index cd895530eef674481bc3c3a5e3dd5774dbd9f8b0..488027521ca5c6f580d90fc4db2471362c4fdbf0 100644
200--- a/main.tf
201+++ b/main.tf
202@@ -1,7 +1,7 @@
203 terraform {
204 backend "s3" {
205 bucket = "charm-terraform-backend"
206- key = "smoothie-development"
207+ key = "soft-serve-development"
208 region = "us-east-1"
209 }
210 }
211@@ -15,7 +15,7 @@ variable "aws_region" {
212 }
213
214 variable "app_image" {
215- default = "ghcr.io/charmbracelet/smoothie-internal:snapshot"
216+ default = "ghcr.io/charmbracelet/soft-serve-internal:snapshot"
217 }
218
219 variable "force_new_deployment" {
220@@ -26,14 +26,14 @@ variable "authorization_keys" {
221 default = ""
222 }
223
224-module "smoothie" {
225- /* source = "../terraform-aws-smoothie" */
226- source = "app.terraform.io/charm/smoothie/aws"
227- version = "0.2.1"
228+module "soft_serve" {
229+ # source = "../terraform-aws-soft-serve"
230+ source = "app.terraform.io/charm/soft-serve/aws"
231+ version = "0.3.0"
232
233 environment = var.environment
234 aws_region = var.aws_region
235- ecs_task_execution_role_name = "smoothieEcsTaskExecutionRole-${var.environment}"
236+ ecs_task_execution_role_name = "softServeEcsTaskExecutionRole-${var.environment}"
237 app_image = var.app_image
238 app_count = 2
239 app_ssh_port = 23231
240diff --git a/tui/bubble.go b/tui/bubble.go
241index 3e78383144fa003d4316cfd4c96acc0f7b27837f..edc5f28cd038adc4d018025a1e5abb460c9ddaca 100644
242--- a/tui/bubble.go
243+++ b/tui/bubble.go
244@@ -2,10 +2,10 @@ package tui
245
246 import (
247 "fmt"
248- "smoothie/git"
249- "smoothie/tui/bubbles/repo"
250- "smoothie/tui/bubbles/selection"
251- "smoothie/tui/style"
252+ "soft-serve/git"
253+ "soft-serve/tui/bubbles/repo"
254+ "soft-serve/tui/bubbles/selection"
255+ "soft-serve/tui/style"
256 "strings"
257
258 tea "github.com/charmbracelet/bubbletea"
259diff --git a/tui/bubbles/commits/bubble.go b/tui/bubbles/commits/bubble.go
260index 1894a504dc3cdaa6d5a3103385b70a40c1908659..593bceb81f111459bbf5a57a0bd45babdd723a06 100644
261--- a/tui/bubbles/commits/bubble.go
262+++ b/tui/bubbles/commits/bubble.go
263@@ -1,7 +1,7 @@
264 package commits
265
266 import (
267- "smoothie/git"
268+ "soft-serve/git"
269 "strings"
270
271 "github.com/charmbracelet/bubbles/viewport"
272diff --git a/tui/bubbles/repo/bubble.go b/tui/bubbles/repo/bubble.go
273index fb7d6c0415ec3c6879e9d694b78328ac21f68923..fdc579ebbbdd567ad93e1abdd8f62d2301d18a3c 100644
274--- a/tui/bubbles/repo/bubble.go
275+++ b/tui/bubbles/repo/bubble.go
276@@ -3,8 +3,8 @@ package repo
277 import (
278 "bytes"
279 "fmt"
280- "smoothie/git"
281- "smoothie/tui/style"
282+ "soft-serve/git"
283+ "soft-serve/tui/style"
284 "strconv"
285 "text/template"
286
287diff --git a/tui/bubbles/selection/bubble.go b/tui/bubbles/selection/bubble.go
288index 13f94f12b59fea38d97d839681296c8cf98d85e6..d669007269ab744123ae8fa41e39fa8e8be3b16a 100644
289--- a/tui/bubbles/selection/bubble.go
290+++ b/tui/bubbles/selection/bubble.go
291@@ -1,7 +1,7 @@
292 package selection
293
294 import (
295- "smoothie/tui/style"
296+ "soft-serve/tui/style"
297
298 tea "github.com/charmbracelet/bubbletea"
299 )
300diff --git a/tui/commands.go b/tui/commands.go
301index 6224cd8580446acd298e6ca938e9b0c699e8e26f..2675cb8634c9d06c722edb58051bc77565fa8bd9 100644
302--- a/tui/commands.go
303+++ b/tui/commands.go
304@@ -2,8 +2,8 @@ package tui
305
306 import (
307 "fmt"
308- "smoothie/tui/bubbles/repo"
309- "smoothie/tui/bubbles/selection"
310+ "soft-serve/tui/bubbles/repo"
311+ "soft-serve/tui/bubbles/selection"
312
313 tea "github.com/charmbracelet/bubbletea"
314 "github.com/charmbracelet/lipgloss"
315diff --git a/tui/defaults.go b/tui/defaults.go
316index eea8af3caa4c6d8e8d3f961f200fe51aeb63fce2..5b7427c6f0368a864e6f1be30e74aaf07a6e069a 100644
317--- a/tui/defaults.go
318+++ b/tui/defaults.go
319@@ -3,16 +3,16 @@ package tui
320 import (
321 "os"
322 "path/filepath"
323- "smoothie/git"
324+ "soft-serve/git"
325
326 gg "github.com/go-git/go-git/v5"
327 "github.com/go-git/go-git/v5/plumbing/object"
328 )
329
330diff --git a/tui/session.go b/tui/session.go
331index da41a8471e6d866f617794cbc59f1a48e1dcd73c..0110cc0e0bc71ddf3ca579d3f3e08a420935d45b 100644
332--- a/tui/session.go
333+++ b/tui/session.go
334@@ -4,7 +4,7 @@ import (
335 "encoding/json"
336 "fmt"
337 "log"
338- "smoothie/git"
339+ "soft-serve/git"
340 "time"
341
342 tea "github.com/charmbracelet/bubbletea"