diff --git a/base.tf.j2 b/base.tf.j2 index 4864e68..d965ef0 100644 --- a/base.tf.j2 +++ b/base.tf.j2 @@ -231,6 +231,16 @@ resource "coder_agent" "main" { git config --global user.name "${data.coder_parameter.git_user_name.value == "" ? data.coder_workspace.me.owner : data.coder_parameter.git_user_name.value}" git config --global user.email "${data.coder_parameter.git_email.value == "" ? data.coder_workspace.me.owner_email : data.coder_parameter.git_email.value}" + + if [ -d "/home/linuxbrew/.linuxbrew" ]; then + if [ -d "$HOME/.linuxbrew" ]; then + rm -rf /home/linuxbrew/.linuxbrew + else + mv /home/linuxbrew/.linuxbrew $HOME/.linuxbrew + fi + + ln $HOME/.linuxbrew /home/linuxbrew/.linuxbrew + fi {% endblock %} {% block post_startup_script_setup_home %} diff --git a/startup_scripts/alpine_aports.sh.j2 b/startup_scripts/alpine_aports.sh.j2 index 41950ee..d9e6ebf 100644 --- a/startup_scripts/alpine_aports.sh.j2 +++ b/startup_scripts/alpine_aports.sh.j2 @@ -1,32 +1,35 @@ sudo adduser coder abuild # Ensure host key verification passes - if [ ! -f .ssh/known_hosts ]; then + if [ ! -f $HOME/.ssh/known_hosts ]; then mkdir -p .ssh ssh-keyscan gitlab.alpinelinux.org > .ssh/known_hosts fi # Clone the aports repository - if [ ! -d aports/.git ]; then - git clone git@gitlab.alpinelinux.org:alpine/aports.git - git config remote.origin.pushurl git@gitlab.alpinelinux.org:mcm/aports.git - else - ( + ( + cd $HOME + if [ ! -d $HOME/aports/.git ]; then + git clone git@gitlab.alpinelinux.org:alpine/aports.git + git config remote.origin.pushurl git@gitlab.alpinelinux.org:mcm/aports.git + else cd aports git remote set-url origin git@gitlab.alpinelinux.org:alpine/aports.git git config remote.origin.pushurl git@gitlab.alpinelinux.org:mcm/aports.git - ) - fi + fi + ) # Generate abuild keys if needed if [ ! -f "$HOME/.abuild/abuild.conf" ]; then abuild-keygen -a -i -n fi - [ -e "$HOME/.abuild/abuild.conf" ] && . $HOME/.abuild/abuild.conf + if [ -e "$HOME/.abuild/abuild.conf" ]; then + . $HOME/.abuild/abuild.conf - if [ -n "$PACKAGER_PRIVKEY" ]; then - sudo cp $PACKAGER_PRIVKEY /etc/apk/keys/ + if [ -n "$PACKAGER_PRIVKEY" ]; then + sudo cp ${PACKAGER_PRIVKEY}.pub /etc/apk/keys/ + fi fi # Update apk @@ -34,4 +37,5 @@ REPO="$HOME/packages/$repo" grep -q "^$REPO" /etc/apk/repositories || (echo $REPO | sudo tee -a /etc/apk/repositories) done - sudo apk update \ No newline at end of file + sudo apk update + sudo apk add --no-cache alpine-sdk \ No newline at end of file diff --git a/startup_scripts/gcloud.sh.j2 b/startup_scripts/gcloud.sh.j2 deleted file mode 100644 index f3122c2..0000000 --- a/startup_scripts/gcloud.sh.j2 +++ /dev/null @@ -1,8 +0,0 @@ - sudo apt update - sudo apt -y install gnupg - - echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list - curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - - - sudo apt update - sudo apt -y install google-cloud-cli \ No newline at end of file diff --git a/startup_scripts/ollama.sh.j2 b/startup_scripts/ollama.sh.j2 deleted file mode 100644 index 80502e3..0000000 --- a/startup_scripts/ollama.sh.j2 +++ /dev/null @@ -1,9 +0,0 @@ - git clone git@github.com:ollama/ollama.git ollama - cd ollama - git submodule init - git submodule update llm/llama.cpp - python3 -m venv llm/llama.cpp/.venv - source llm/llama.cpp/.venv/bin/activate - pip install -r llm/llama.cpp/requirements.txt - make -C llm/llama.cpp quantize - git lfs install \ No newline at end of file diff --git a/startup_scripts/terraform.sh.j2 b/startup_scripts/terraform.sh.j2 deleted file mode 100644 index a30548e..0000000 --- a/startup_scripts/terraform.sh.j2 +++ /dev/null @@ -1,13 +0,0 @@ - sudo apt update - sudo apt -y install unzip lsb-release - - curl -sSLO https://github.com/terraform-linters/tflint/releases/download/v0.48.0/tflint_linux_amd64.zip - unzip tflint_linux_amd64.zip - sudo mv tflint /usr/local/bin - rm tflint_linux_amd64.zip - - curl https://apt.releases.hashicorp.com/gpg | sudo apt-key --keyring /usr/share/keyrings/hashicorp-archive-keyring.gpg add - - echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list.d/hashicorp.list - - sudo apt update - sudo apt install terraform \ No newline at end of file