update botway full docker image, update discord temps dockerfiles

abdfnx · May 10, 2022 · 219046b · 219046b
1 parent c1f093b
commit 219046b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/constants/constants.go b/constants/constants.go
@@ -36,6 +36,7 @@ var (
 	HomeDir, _ = dfs.GetHomeDirectory()
 	BotwayConfigFile = filepath.Join(HomeDir, ".botway", "botway.json")
 	BotwayConfig, Berr = ioutil.ReadFile(BotwayConfigFile)
+	BotConfig, Oerr = ioutil.ReadFile(".botway.yaml")
 
 	BotwayDirPath = func () string {
 		if runtime.GOOS == "windows" {

diff --git a/docker/full.dockerfile b/docker/full.dockerfile
@@ -1,7 +1,7 @@
 FROM frolvlad/alpine-glibc:alpine-3.14_glibc-2.33
 
 ### variables ###
-ENV PKGS="zip unzip git curl npm build-base neofetch zsh sudo make lsof wget gcc asciidoctor ca-certificates bash-completion htop jq less llvm nano vim ruby-full ruby-dev libffi-dev"
+ENV PKGS="zip unzip git curl npm rust libsodium ffmpeg cargo build-base build-dependencies abuild binutils opus autoconf automake libtool m4 youtube-dl binutils-doc gcc-doc python3-dev neofetch zsh sudo make lsof wget gcc asciidoctor ca-certificates bash-completion htop jq less llvm nano vim ruby-full ruby-dev libffi-dev"
 ENV ZSHRC=".zshrc"
 
 ### install packages ###
@@ -15,9 +15,7 @@ RUN adduser -D bw \
     && chmod 0440 /etc/sudoers.d/bw
 
 ### nodejs package managers ###
-RUN npm i -g npm@latest
-RUN npm i -g yarn@latest
-RUN npm i -g pnpm@latest
+RUN npm i -g npm@latest yarn@latest pnpm@latest
 
 ### botway ###
 # RUN curl -sL https://botway.web.app/get | bash
@@ -33,15 +31,16 @@ RUN zsh && \
     git clone https://github.com/zsh-users/zsh-syntax-highlighting ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting && \
     git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
 
-### rust ###
-RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
-RUN /bin/bash -c "source ~/.cargo/env"
+### fleet ###
+RUN curl -L get.fleet.rs | sh
+
+### update bundler ###
+RUN sudo gem update bundler
 
 ### go ###
 RUN wget "https://dl.google.com/go/$(curl https://go.dev/VERSION?m=text).linux-amd64.tar.gz"
 RUN sudo tar -C /usr/local -xzf "$(curl https://go.dev/VERSION?m=text).linux-amd64.tar.gz"
 ENV GOROOT /usr/local/go/bin
-ENV GOPATH /go
 ENV PATH /go/bin:$PATH
 RUN rm "$(curl https://go.dev/VERSION?m=text).linux-amd64.tar.gz"
 

diff --git a/internal/pipes/token/discord/guilds/ids.go b/internal/pipes/token/discord/guilds/ids.go
@@ -11,8 +11,8 @@ import (
 	token_shared "github.com/abdfnx/botway/internal/pipes/token"
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/tidwall/sjson"
 	"github.com/tidwall/gjson"
+	"github.com/tidwall/sjson"
 )
 
 type model struct {
@@ -41,10 +41,10 @@ func (m model) AddGuildId() {
 			log.Fatal(remove)
 		}
 
-		newBotConfig := os.WriteFile(token_shared.BotwayConfigPath, []byte(newGuild), 0644)
+		newBotwayConfig := os.WriteFile(token_shared.BotwayConfigPath, []byte(newGuild), 0644)
 
-		if newBotConfig != nil {
-			panic(newBotConfig)
+		if newBotwayConfig != nil {
+			panic(newBotwayConfig)
 		}
 
 		fmt.Print(constants.SUCCESS_BACKGROUND.Render("SUCCESS"))

diff --git a/templates/discord/nodejs/assets/yarn/Dockerfile b/templates/discord/nodejs/assets/yarn/Dockerfile
@@ -15,7 +15,7 @@ RUN apk update && \
 # Add packages you want
 # RUN apk add PACKAGE_NAME
 
-RUN botway init --docker --name ${DISCORD_BOT_NAME}
+RUN botway init --docker
 RUN yarn
 
 EXPOSE 8000

diff --git a/templates/discord/rust/assets/cargo/Dockerfile b/templates/discord/rust/assets/cargo/Dockerfile
@@ -14,7 +14,7 @@ RUN apk update && \
 # Add packages you want
 # RUN apk add PACKAGE_NAME
 
-RUN botway init --docker --name ${DISCORD_BOT_NAME}
+RUN botway init --docker
 RUN cargo build --release
 RUN cp ./target/release/${DISCORD_BOT_NAME} .
 

diff --git a/templates/discord/rust/assets/fleet/Dockerfile b/templates/discord/rust/assets/fleet/Dockerfile
@@ -14,7 +14,7 @@ RUN apk update && \
 # Add packages you want
 # RUN apk add PACKAGE_NAME
 
-RUN botway init --docker --name ${DISCORD_BOT_NAME}
+RUN botway init --docker
 RUN curl -L get.fleet.rs | sh
 RUN fleet build --release
 RUN cp ./target/release/${DISCORD_BOT_NAME} .