From 956fe7f4fa31dfa556ac5a49f0d251ba943b7486 Mon Sep 17 00:00:00 2001 From: Noel Date: Thu, 27 Oct 2022 13:33:15 -0700 Subject: [PATCH] [images/base] Add Python 3 into base image --- images/base/Dockerfile | 3 ++- templates/charted-server/README.md | 3 ++- templates/charted-server/main.tf | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/images/base/Dockerfile b/images/base/Dockerfile index a0d0d75..53fc174 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -29,7 +29,7 @@ ENV USERNAME=noel \ # Install needed packages RUN DEBIAN_FRONTEND=noninteractive apt update && \ DEBIAN_FRONTEND=noninteractive apt upgrade -y && \ - DEBIAN_FRONTEND=noninteractive apt install -y sudo git curl neofetch git-lfs ca-certificates unzip zip bash vim nano + DEBIAN_FRONTEND=noninteractive apt install -y sudo git curl neofetch git-lfs ca-certificates unzip zip bash vim nano python3 python3-pip # Setup the user environment RUN groupadd -g ${USER_GID} ${USERNAME} && \ @@ -90,6 +90,7 @@ RUN echo "export PATH=\"\$PATH:/opt/coder/cli\"" >> /home/${USERNAME}/.bashrc RUN echo "export PATH=\"\$PATH:/opt/hashicorp/terraform\"" >> /home/${USERNAME}/.bashrc RUN echo "export PATH=\"\$PATH:/opt/github/cli/bin\"" >> /home/${USERNAME}/.bashrc RUN echo "export PATH=\"\$PATH:/opt/helm\"" >> /home/${USERNAME}/.bashrc +RUN echo "export PATH=\"\$PATH:/home/${USERNAME}/.local/bin\"" >> /home/${USERNAME}/.bashrc # Add common Helm repositores RUN /opt/helm/helm repo add bitnami https://charts.bitnami.com/bitnami diff --git a/templates/charted-server/README.md b/templates/charted-server/README.md index 578dacf..6ea8608 100644 --- a/templates/charted-server/README.md +++ b/templates/charted-server/README.md @@ -3,6 +3,7 @@ This template is made for the use of [**charted-server**](https://github.com/cha ## How to use this template? ```sh -# You will need to be signed into Coder to do this +# You will need to be signed into Coder to do this to import this template $ cd templates/charted-server +$ coder templates create "charted-server" --yes ``` diff --git a/templates/charted-server/main.tf b/templates/charted-server/main.tf index 705f3a8..ba602ec 100644 --- a/templates/charted-server/main.tf +++ b/templates/charted-server/main.tf @@ -67,6 +67,11 @@ resource "coder_agent" "main" { startup_script = <<-EOF #!/bin/bash + # This script installs JetBrains Projector, I'm fine with the latency, but + # you might not. + PROJECTOR_LOGS=/home/noel/.logs/projector.log + PROJECTOR_BINARY= + # Setup Git ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts