Merge branch 'main' into local-container

bpmct · bpmct · commit fb6b7b4af14d · 2021-06-29T23:46:24.000-04:00
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ A collection of one-click buttons and scripts for deploying [code-server](https:
 
 |                                                                                                                 | Name              | Type          | Lowest-Price Plan             | Deploy                                                  |
 | --------------------------------------------------------------------------------------------------------------- | ----------------- | ------------- | ----------------------------- | ------------------------------------------------------- |
-| [![AWS EC2](img/logo/aws-ec2.png)](https://digitalocean.com)                                                    | AWS EC2           | VM            | Free Tier, 1 CPU, 1 GB RAM    | [see guide](guides/aws-ec2.md)                          |
+| [![AWS EC2](img/logo/aws-ec2.png)](https://aws.amazon.com/ec2)                                                  | AWS EC2           | VM            | Free Tier, 1 CPU, 1 GB RAM    | [see guide](guides/aws-ec2.md)                          |
 | [![DigitalOcean](img/logo/digitalocean.png)](https://digitalocean.com)                                          | DigitalOcean      | VM            | $5/mo, 1 CPU, 1 GB RAM        | [see guide](guides/digitalocean.md)                     |
 | [![Vultr](img/logo/vultr.png)](https://vultr.com)                                                               | Vultr             | VM            | $3.50/mo, 1 CPU, 512 MB RAM   | coming soon                                             |
 | [![Linode](img/logo/linode.png)](https://linode.com)                                                            | Linode            | VM            | $5/mo, 1 CPU, 1 GB RAM        | [see guide](guides/linode.md)                           |
diff --git a/deploy-container/README.md b/deploy-container/README.md
@@ -42,13 +42,15 @@ COPY deploy-container/myTool /home/coder/myTool
 
 ## Environment variables
 
-| Variable Name     | Description                                                                                      | Default Value       |
-| ----------------- | ------------------------------------------------------------------------------------------------ | ------------------- |
-| `PASSWORD`        | Password for code-server                                                                         |                     |
-| `HASHED_PASSWORD` | Overrrides PASSWORD. [SHA-256 hash](https://xorbin.com/tools/sha256-hash-calculator) of password |
-| `USE_LINK`        | Use code-server --link instead of a password (coming soon)                                       | false               |
-| `GIT_REPO`        | A git repository to clone                                                                        |                     |
-| `START_DIR`       | The directory code-server opens (and clones repos in)                                            | /home/coder/project |
+| Variable Name      | Description                                                                                        | Default Value       |
+| ------------------ | -------------------------------------------------------------------------------------------------- | ------------------- |
+| `PASSWORD`         | Password for code-server                                                                           |                     |
+| `HASHED_PASSWORD`  | Overrrides PASSWORD. [SHA-256 hash](https://xorbin.com/tools/sha256-hash-calculator) of password   |
+| `USE_LINK`         | Use code-server --link instead of a password (coming soon)                                         | false               |
+| `GIT_REPO`         | A git repository to clone                                                                          |                     |
+| `DOTFILES_REPO`    | A [dotfiles](https://dotfiles.github.io/) repo to save preferences. Runs install.sh, if it exists. |                     |
+| `DOTFILES_SYMLINK` | Symlinks dotfiles repo to $HOME, if exits.                                                         | true                |
+| `START_DIR`        | The directory code-server opens (and clones repos in)                                              | /home/coder/project |
 
 ---
 
diff --git a/deploy-container/entrypoint.sh b/deploy-container/entrypoint.sh
@@ -76,6 +76,25 @@ else
 
 fi
 
+# Add dotfiles, if set
+if [ -n "$DOTFILES_REPO" ]; then
+    # grab the files from the remote instead of running project_init()
+    echo "[$PREFIX] Cloning dotfiles..."
+    mkdir -p $HOME/dotfiles
+    git clone $DOTFILES_REPO $HOME/dotfiles
+
+    DOTFILES_SYMLINK="${RCLONE_AUTO_PULL:-true}"
+
+    # symlink repo to $HOME
+    if [ $DOTFILES_SYMLINK = "true" ]; then
+        shopt -s dotglob
+        ln -sf source_file $HOME/dotfiles/* $HOME
+    fi
+
+    # run install script, if it exists
+    [ -f "$HOME/dotfiles/install.sh" ] && $HOME/dotfiles/install.sh
+fi
+
 echo "[$PREFIX] Starting code-server..."
 # Now we can run code-server with the default entrypoint
 /usr/bin/entrypoint.sh --bind-addr 0.0.0.0:8080 $START_DIR
