From 14bd6547de850a56aa091aa303d077b92f530012 Mon Sep 17 00:00:00 2001
From: yssk22 <yssk22@gmail.com>
Date: Wed, 5 Aug 2026 15:53:06 +0000
Subject: [PATCH] [devcontainer] fix devcontainer build

^^

Summary Here

**Test**

- N/A

**Issue**

- N/A
---
 .devcontainer.json    | 29 ++++++++++++++++-------------
 containers/Dockerfile | 19 +++++++++++--------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/.devcontainer.json b/.devcontainer.json
index dd4b2a7a..adc60312 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -9,25 +9,28 @@
         8080,
         8081
     ],
-    "onCreateCommand": ["/bin/bash", "/workspaces/sites/containers/onCreateCommand.sh"],
+    "onCreateCommand": [
+        "/bin/bash",
+        "/workspaces/hpapp/containers/onCreateCommand.sh"
+    ],
     "customizations": {
         "vscode": {
             "extensions": [
                 "dbaeumer.vscode-eslint",
-				"eamodio.gitlens",
-				"esbenp.prettier-vscode",
-				"expo.vscode-expo-tools",
-				"github.copilot",
+                "eamodio.gitlens",
+                "esbenp.prettier-vscode",
+                "expo.vscode-expo-tools",
+                "github.copilot",
                 "github.copilot-chat",
-				"github.vscode-pull-request-github",
-				"golang.go",
+                "github.vscode-pull-request-github",
+                "golang.go",
                 "graphql.vscode-graphql-syntax",
-				"gruntfuggly.todo-tree",
-				"meta.relay",
-				"mhutchie.git-graph",
-				"oderwat.indent-rainbow",
-				"orta.vscode-jest"
-			]
+                "gruntfuggly.todo-tree",
+                "meta.relay",
+                "mhutchie.git-graph",
+                "oderwat.indent-rainbow",
+                "orta.vscode-jest"
+            ]
         }
     },
 }
\ No newline at end of file
diff --git a/containers/Dockerfile b/containers/Dockerfile
index 2cfa9070..4f258519 100644
--- a/containers/Dockerfile
+++ b/containers/Dockerfile
@@ -1,11 +1,11 @@
 FROM gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.0 AS cloud-sql-proxy
 FROM golang:1.22.4 AS go
-FROM node:22.3.0 AS node
+FROM node:22.13.1 AS node
 FROM google/cloud-sdk:latest AS cloud-sdk
 
-ENV ANDROID_HOME /opt/android-sdk
-ENV NVIDIA_VISIBLE_DEVICES all
-ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
+ENV ANDROID_HOME=/opt/android-sdk
+ENV NVIDIA_VISIBLE_DEVICES=all
+ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
 
 COPY --from=cloud-sql-proxy /cloud-sql-proxy /usr/local/bin/cloud-sql-proxy
 COPY --from=go /usr/local/go /usr/local/go
@@ -14,19 +14,22 @@ COPY --from=node /usr/local/lib/node_modules/ /usr/local/lib/node_modules/
 COPY --from=node /opt/ /opt/
 
 RUN apt-get update && apt-get install -y make wget curl sudo android-sdk
-ENV GOROOT /usr/local/go
+ENV GOROOT=/usr/local/go
+ENV GOPATH=/go
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.2
 
-ENV PATH $PATH:/usr/local/bin:/usr/local/go/bin:$GOPATH/bin:/usr/local/node_modules/.bin/
+ENV PATH=${PATH}:/usr/local/bin:/usr/local/go/bin:${GOPATH}/bin:/usr/local/lib/node_modules/.bin
 
 ## tools for dev
 RUN apt-get install -y bash procps default-mysql-client vim sqlite3
 
 ## yarn
-RUN /usr/local/bin/yarn global add prettier expo-cli eas-cli expo-doctor
+RUN corepack enable \
+	&& corepack prepare yarn@1.22.22 --activate \
+	&& yarn global add prettier expo-cli eas-cli expo-doctor
 
 ### python
-### See onCreateCommand.sh 
+### See onCreateCommand.sh
 
 USER root
 CMD ["/bin/bash"]