From 39424d5e3ebdd8eef4fea5c59a098466e8b597e1 Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 14:11:37 -0400 Subject: [PATCH 01/15] Added nodejs and npm for chrome extension --- .sail/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.sail/Dockerfile b/.sail/Dockerfile index 8111313..a1a7ca6 100644 --- a/.sail/Dockerfile +++ b/.sail/Dockerfile @@ -12,3 +12,7 @@ RUN wget -O /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v0. rm -f /tmp/hugo.deb RUN installext peterjausovec.vscode-docker + +RUN sudo apt-get install curl python-software-properties && \ + curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - && \ + sudo apt-get install nodejs \ No newline at end of file From 1878641393ecf27c78deec99fb955a3ff20edc0f Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 14:17:40 -0400 Subject: [PATCH 02/15] added update --- .sail/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.sail/Dockerfile b/.sail/Dockerfile index a1a7ca6..5976ff2 100644 --- a/.sail/Dockerfile +++ b/.sail/Dockerfile @@ -1,5 +1,6 @@ FROM codercom/ubuntu-dev-go:latest +RUN sudo apt-get update RUN sudo apt-get install -y htop LABEL project_root "~/go/src/go.coder.com" @@ -8,8 +9,8 @@ ENV GO111MODULE=off # Install the latest version of Hugo. RUN wget -O /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v0.55.4/hugo_extended_0.55.4_Linux-64bit.deb && \ - sudo dpkg -i /tmp/hugo.deb && \ - rm -f /tmp/hugo.deb + sudo dpkg -i /tmp/hugo.deb && \ + rm -f /tmp/hugo.deb RUN installext peterjausovec.vscode-docker From 2504baa945f891f4ce29547f623f76c6b106232c Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 14:19:17 -0400 Subject: [PATCH 03/15] Changed name of package --- .sail/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.sail/Dockerfile b/.sail/Dockerfile index 5976ff2..cb4ca5f 100644 --- a/.sail/Dockerfile +++ b/.sail/Dockerfile @@ -14,6 +14,8 @@ RUN wget -O /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v0. RUN installext peterjausovec.vscode-docker -RUN sudo apt-get install curl python-software-properties && \ +RUN sudo apt-get install curl + +RUN sudo apt-get install software-properties-common && \ curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - && \ sudo apt-get install nodejs \ No newline at end of file From 0b41a26e21caac793f43f080f27c191015e7d820 Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 14:19:58 -0400 Subject: [PATCH 04/15] added yes --- .sail/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.sail/Dockerfile b/.sail/Dockerfile index cb4ca5f..f1faee7 100644 --- a/.sail/Dockerfile +++ b/.sail/Dockerfile @@ -14,8 +14,8 @@ RUN wget -O /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v0. RUN installext peterjausovec.vscode-docker -RUN sudo apt-get install curl +RUN sudo apt-get install curl -y -RUN sudo apt-get install software-properties-common && \ +RUN sudo apt-get install software-properties-common -y && \ curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - && \ sudo apt-get install nodejs \ No newline at end of file From 9a41bd4b0a9d7c1d329900eee9f61a6ca154b4f8 Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 14:21:34 -0400 Subject: [PATCH 05/15] added yes to nodejs installation --- .sail/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sail/Dockerfile b/.sail/Dockerfile index f1faee7..6ff13f4 100644 --- a/.sail/Dockerfile +++ b/.sail/Dockerfile @@ -18,4 +18,4 @@ RUN sudo apt-get install curl -y RUN sudo apt-get install software-properties-common -y && \ curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - && \ - sudo apt-get install nodejs \ No newline at end of file + sudo apt-get install nodejs -y \ No newline at end of file From 190a1140a5ece1011736684b9f429b2683e375e1 Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 14:34:44 -0400 Subject: [PATCH 06/15] changed to have only one RUN command for install --- .sail/Dockerfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.sail/Dockerfile b/.sail/Dockerfile index 6ff13f4..cb22cf8 100644 --- a/.sail/Dockerfile +++ b/.sail/Dockerfile @@ -1,7 +1,10 @@ FROM codercom/ubuntu-dev-go:latest -RUN sudo apt-get update -RUN sudo apt-get install -y htop +RUN sudo apt-get update && \ + sudo apt-get install -y htop && \ + sudo apt-get install -y software-properties-common && \ + curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - && \ + sudo apt-get install -y nodejs LABEL project_root "~/go/src/go.coder.com" # Modules break much of Go's tooling. @@ -12,10 +15,4 @@ RUN wget -O /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v0. sudo dpkg -i /tmp/hugo.deb && \ rm -f /tmp/hugo.deb -RUN installext peterjausovec.vscode-docker - -RUN sudo apt-get install curl -y - -RUN sudo apt-get install software-properties-common -y && \ - curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - && \ - sudo apt-get install nodejs -y \ No newline at end of file +RUN installext peterjausovec.vscode-docker \ No newline at end of file From 74bb00f6a6ede4e85bcb96ed9e773b97d5a62870 Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 15:03:59 -0400 Subject: [PATCH 07/15] updated to use nvm for node install --- .sail/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.sail/Dockerfile b/.sail/Dockerfile index cb22cf8..0bc905f 100644 --- a/.sail/Dockerfile +++ b/.sail/Dockerfile @@ -2,9 +2,8 @@ FROM codercom/ubuntu-dev-go:latest RUN sudo apt-get update && \ sudo apt-get install -y htop && \ - sudo apt-get install -y software-properties-common && \ - curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - && \ - sudo apt-get install -y nodejs + curl -sL https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | sudo -E bash - + LABEL project_root "~/go/src/go.coder.com" # Modules break much of Go's tooling. From 5d63a9bdb45fd9790627ef57fe2a2d02bad3dd84 Mon Sep 17 00:00:00 2001 From: Robert M Date: Wed, 22 May 2019 15:55:54 -0400 Subject: [PATCH 08/15] Changed to using newest nvm version Co-Authored-By: Nathan Potter --- .sail/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.sail/Dockerfile b/.sail/Dockerfile index 0bc905f..142ad3e 100644 --- a/.sail/Dockerfile +++ b/.sail/Dockerfile @@ -2,7 +2,9 @@ FROM codercom/ubuntu-dev-go:latest RUN sudo apt-get update && \ sudo apt-get install -y htop && \ - curl -sL https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | sudo -E bash - +RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash && \ + . ~/.nvm/nvm.sh \ + && nvm install node LABEL project_root "~/go/src/go.coder.com" @@ -14,4 +16,4 @@ RUN wget -O /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v0. sudo dpkg -i /tmp/hugo.deb && \ rm -f /tmp/hugo.deb -RUN installext peterjausovec.vscode-docker \ No newline at end of file +RUN installext peterjausovec.vscode-docker From eda91b23a7c89c7323e44ce76c9322fec6e4fb9d Mon Sep 17 00:00:00 2001 From: Robert M Date: Wed, 22 May 2019 15:56:24 -0400 Subject: [PATCH 09/15] Changed shell to bash Co-Authored-By: Nathan Potter --- .sail/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sail/Dockerfile b/.sail/Dockerfile index 142ad3e..c3c3168 100644 --- a/.sail/Dockerfile +++ b/.sail/Dockerfile @@ -1,5 +1,5 @@ FROM codercom/ubuntu-dev-go:latest - +SHELL ["/bin/bash", "-c"] RUN sudo apt-get update && \ sudo apt-get install -y htop && \ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash && \ From 5004abf1d5842055f51b8c2d0a6b5b9aca8b3420 Mon Sep 17 00:00:00 2001 From: Robert M Date: Wed, 22 May 2019 16:00:30 -0400 Subject: [PATCH 10/15] Removed trailing `&& \` Co-Authored-By: Nathan Potter --- .sail/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sail/Dockerfile b/.sail/Dockerfile index c3c3168..1362482 100644 --- a/.sail/Dockerfile +++ b/.sail/Dockerfile @@ -1,7 +1,7 @@ FROM codercom/ubuntu-dev-go:latest SHELL ["/bin/bash", "-c"] RUN sudo apt-get update && \ - sudo apt-get install -y htop && \ + sudo apt-get install -y htop RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash && \ . ~/.nvm/nvm.sh \ && nvm install node From 1846600ddb1b7d1f48bdc2f315537322be069378 Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 14:59:40 -0400 Subject: [PATCH 11/15] Added version command --- main.go | 1 + versionmd.go | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 versionmd.go diff --git a/main.go b/main.go index d859bea..0423173 100644 --- a/main.go +++ b/main.go @@ -66,6 +66,7 @@ func (r rootCmd) Subcommands() []cli.Command { &rmcmd{gf: &r.globalFlags}, &proxycmd{}, &chromeExtInstall{}, + &versioncmd{}, } } diff --git a/versionmd.go b/versionmd.go new file mode 100644 index 0000000..3489b86 --- /dev/null +++ b/versionmd.go @@ -0,0 +1,29 @@ +package main + +import ( + "flag" + "fmt" + + "go.coder.com/cli" +) + +var version string + +type versioncmd struct { + print bool +} + +func (v *versioncmd) Spec() cli.CommandSpec { + return cli.CommandSpec{ + Name: "version", + Desc: fmt.Sprintf("Retrieve the current version"), + } +} + +func (v *versioncmd) RegisterFlags(fl *flag.FlagSet) { + fl.BoolVar(&v.print, "print", false, "Print the current version of Sail") +} + +func (v *versioncmd) Run(fl *flag.FlagSet) { + fmt.Printf("Sail version: %s", version) +} From 08a426810dcc09c2a574cafedbcc8dd49995efb5 Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 15:13:16 -0400 Subject: [PATCH 12/15] added docs --- site/content/docs/commands/version.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 site/content/docs/commands/version.md diff --git a/site/content/docs/commands/version.md b/site/content/docs/commands/version.md new file mode 100644 index 0000000..954912c --- /dev/null +++ b/site/content/docs/commands/version.md @@ -0,0 +1,14 @@ ++++ +type="docs" +title="version" +browser_title="Sail - Commands - version" +section_order=4 ++++ + +``` +Usage: sail version + +Outputs the version of sail that you have installed +``` + +This command is useful when creating an issue. \ No newline at end of file From 75b6ed115bda579be82e528e5143761edcaf80a4 Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 15:18:09 -0400 Subject: [PATCH 13/15] removed docs --- site/content/docs/commands/version.md | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 site/content/docs/commands/version.md diff --git a/site/content/docs/commands/version.md b/site/content/docs/commands/version.md deleted file mode 100644 index 954912c..0000000 --- a/site/content/docs/commands/version.md +++ /dev/null @@ -1,14 +0,0 @@ -+++ -type="docs" -title="version" -browser_title="Sail - Commands - version" -section_order=4 -+++ - -``` -Usage: sail version - -Outputs the version of sail that you have installed -``` - -This command is useful when creating an issue. \ No newline at end of file From 71a299c99a9d3d8203dc4067bd5d83fe84488cd1 Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 17:43:59 -0400 Subject: [PATCH 14/15] Changes based on PR --- versionmd.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/versionmd.go b/versionmd.go index 3489b86..0070586 100644 --- a/versionmd.go +++ b/versionmd.go @@ -9,21 +9,15 @@ import ( var version string -type versioncmd struct { - print bool -} +type versioncmd struct {} func (v *versioncmd) Spec() cli.CommandSpec { return cli.CommandSpec{ Name: "version", - Desc: fmt.Sprintf("Retrieve the current version"), + Desc: fmt.Sprintf("Retrieve the current version."), } } -func (v *versioncmd) RegisterFlags(fl *flag.FlagSet) { - fl.BoolVar(&v.print, "print", false, "Print the current version of Sail") -} - func (v *versioncmd) Run(fl *flag.FlagSet) { - fmt.Printf("Sail version: %s", version) + fmt.Printf(version) } From da9ca808b190991d763827b1beaa442b71ef3c85 Mon Sep 17 00:00:00 2001 From: Robert Miller Date: Wed, 22 May 2019 18:06:35 -0400 Subject: [PATCH 15/15] Changed to println --- versionmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionmd.go b/versionmd.go index 0070586..bcc71a2 100644 --- a/versionmd.go +++ b/versionmd.go @@ -19,5 +19,5 @@ func (v *versioncmd) Spec() cli.CommandSpec { } func (v *versioncmd) Run(fl *flag.FlagSet) { - fmt.Printf(version) + fmt.Println(version) }