From 112c6bb0f600d0e25830b333deba5f642a0ea8a9 Mon Sep 17 00:00:00 2001
From: bennykok <itechbenny@gmail.com>
Date: Fri, 26 Jan 2024 16:09:50 +0800
Subject: [PATCH] Squashed commit of the following:

commit 2afcade4f2f55e7baefd67a6b17eea08219cf293
Author: bennykok <itechbenny@gmail.com>
Date:   Fri Jan 26 16:07:54 2024 +0800

    fix: add fly io to dev container

commit d70333baa606bbf9c6252c1c8f67763234a111cf
Author: BennyKok <itechbenny@gmail.com>
Date:   Fri Jan 26 07:47:41 2024 +0000

    fix: comment typo

commit 43cfebd97a8981805e0fdb661188e3f8b753c54e
Author: BennyKok <itechbenny@gmail.com>
Date:   Fri Jan 26 07:33:30 2024 +0000

    fix: only create share slug when public-share deployment
---
 .devcontainer/Dockerfile        | 11 +++++++++++
 .devcontainer/devcontainer.json |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 8fac02f..b37a79f 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -4,4 +4,15 @@ FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT}
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 #     && apt-get -y install --no-install-recommends <your-package-list-here>
 
+WORKDIR "/"
+
+# Install fly
+RUN curl -L https://fly.io/install.sh | sh
+
+ENV FLYCTL_INSTALL="/root/.fly"
+ENV PATH="$FLYCTL_INSTALL/bin:$PATH"
+
+# RUN echo 'export FLYCTL_INSTALL="/home/node/.fly"' >> ~/.bashrc
+# RUN echo 'export PATH="$FLYCTL_INSTALL/bin:$PATH"' >> ~/.bashrc
+
 RUN npm install -g bun
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7af2a31..1e3b6de 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,6 +4,7 @@
   "service": "app",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
   "postCreateCommand": "cd web && bun install && bun run migrate-local",
+  "remoteUser": "root",
   "customizations": {
     "vscode": {
       "extensions": [
@@ -13,7 +14,8 @@
         "stivo.tailwind-fold",
         "streetsidesoftware.code-spell-checker",
         "GitHub.copilot",
+        "ms-azuretools.vscode-docker"
       ]
     }
   }
-}
+}
\ No newline at end of file