diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index bc99d8b..9cc4406 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -20,33 +20,33 @@ RUN useradd -m -s /usr/bin/bash ${USER} \ && echo "${USER} ALL=(ALL) NOPASSWD: ALL" >/etc/sudoers.d/${USER} \ && chmod 0440 /etc/sudoers.d/${USER} -# Install Poetry -RUN pip install --no-cache-dir poetry +# # Install Poetry +# RUN pip install --no-cache-dir poetry -# Install Node.js 22 (from NodeSource) -RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \ - && apt install -y nodejs \ - && node -v \ - && npm -v +# # Install Node.js 22 (from NodeSource) +# RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \ +# && apt install -y nodejs \ +# && node -v \ +# && npm -v -# Install aws -RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" -RUN unzip awscliv2.zip -RUN ./aws/install +# # Install aws +# RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" +# RUN unzip awscliv2.zip +# RUN ./aws/install -# Install terraform -RUN apt-get update && sudo apt-get install -y gnupg software-properties-common -RUN wget -O- https://apt.releases.hashicorp.com/gpg | \ -gpg --dearmor | \ -sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg > /dev/null -RUN echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] \ -https://apt.releases.hashicorp.com $(lsb_release -cs) main" | \ -tee /etc/apt/sources.list.d/hashicorp.list -RUN apt update -RUN apt-get install terraform -RUN terraform -install-autocomplete +# # Install terraform +# RUN apt-get update && sudo apt-get install -y gnupg software-properties-common +# RUN wget -O- https://apt.releases.hashicorp.com/gpg | \ +# gpg --dearmor | \ +# sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg > /dev/null +# RUN echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] \ +# https://apt.releases.hashicorp.com $(lsb_release -cs) main" | \ +# tee /etc/apt/sources.list.d/hashicorp.list +# RUN apt update +# RUN apt-get install terraform +# RUN terraform -install-autocomplete # Set the working directory diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 82c39a8..6ac624f 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -7,44 +7,5 @@ services: context: .. dockerfile: .devcontainer/Dockerfile command: sleep infinity - env_file: - - ../.db-env volumes: - ..:/workspaces/insight - depends_on: - - db - networks: - - survey-net - - db: - image: postgres:17.4 - restart: unless-stopped - ports: - - 5432:5432 - env_file: - - ../.db-env - volumes: - - postgres-data:/var/lib/postgresql/data - networks: - - survey-net - - pgadmin: - image: dpage/pgadmin4 - hostname: pgadmin - ports: - - 5555:80 - env_file: - - ../.db-env - restart: unless-stopped - depends_on: - - db - networks: - - survey-net - -networks: - survey-net: - driver: bridge - -volumes: - postgres-data: - diff --git a/.devcontainer/post-install.sh b/.devcontainer/post-install.sh index 473e420..d9fc3a9 100644 --- a/.devcontainer/post-install.sh +++ b/.devcontainer/post-install.sh @@ -1,27 +1,27 @@ -#!/bin/bash -poetry install; +# #!/bin/bash +# poetry install; -# Get the Poetry virtual environment path -VENV_PATH=$(poetry env info --path 2>/dev/null) +# # Get the Poetry virtual environment path +# VENV_PATH=$(poetry env info --path 2>/dev/null) -if [ -z "$VENV_PATH" ]; then - echo "No Poetry environment found. Did you run 'poetry install'?" - exit 1 -fi +# if [ -z "$VENV_PATH" ]; then +# echo "No Poetry environment found. Did you run 'poetry install'?" +# exit 1 +# fi -# Ensure VS Code settings directory exists -SETTINGS_DIR="/home/vscode/.vscode-server/data/Machine" -SETTINGS_FILE="$SETTINGS_DIR/settings.json" +# # Ensure VS Code settings directory exists +# SETTINGS_DIR="/home/vscode/.vscode-server/data/Machine" +# SETTINGS_FILE="$SETTINGS_DIR/settings.json" -mkdir -p "$SETTINGS_DIR" +# mkdir -p "$SETTINGS_DIR" -# If settings.json doesn't exist, create a default one -if [ ! -f "$SETTINGS_FILE" ]; then - echo "{}" > "$SETTINGS_FILE" -fi +# # If settings.json doesn't exist, create a default one +# if [ ! -f "$SETTINGS_FILE" ]; then +# echo "{}" > "$SETTINGS_FILE" +# fi -# Update VS Code settings to use the Poetry virtual environment -jq --arg venv "$VENV_PATH/bin/python" '.["python.defaultInterpreterPath"] = $venv' \ - "$SETTINGS_FILE" > "$SETTINGS_FILE.tmp" && mv "$SETTINGS_FILE.tmp" "$SETTINGS_FILE" +# # Update VS Code settings to use the Poetry virtual environment +# jq --arg venv "$VENV_PATH/bin/python" '.["python.defaultInterpreterPath"] = $venv' \ +# "$SETTINGS_FILE" > "$SETTINGS_FILE.tmp" && mv "$SETTINGS_FILE.tmp" "$SETTINGS_FILE" -echo "✅ Updated VS Code to use Poetry environment: $VENV_PATH" +# echo "✅ Updated VS Code to use Poetry environment: $VENV_PATH" diff --git a/README.md b/README.md index 3df5106..d758ee9 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ Initial Project spec Single dashboard with: - [Typhaine] Weekly planned numbers - [Typhaine] Weekly completed numbers - [Typhaine] Ideally covers a couple of weeks + Weekly planned numbers + Weekly completed numbers + Ideally covers a couple of weeks Note: We may not feasibly be able to do this with just HubSpot tracking and so we may require a script to complete this with the data being pushed to a database. Build a dashboard (dash?). @@ -28,9 +28,9 @@ Stack: Dash + Github actions for re-reruns + S3 for data-storage [don't set up a Technical Scope: Junte: + - Typhaine will need a computer with linux + - VM, wsl, i recommend ubunutu for her with a new company laptop? - Typhaine will need a linux machine to connect to do this - - I've set up a temporary computer so that she can learn how to do this first - _ Ask khalim which is better for now - Set up a basic devcontianer with python and poetry Dash + Github Actions (etl of hubspot) + S3 ( data stroage) + devcontainer for typhaine \ No newline at end of file