From daa5c5f2c1e65a823c0a34fcdb7eca16f7f5539e Mon Sep 17 00:00:00 2001
From: Daisuke MAKIUCHI <makiuchi-d@klab.com>
Date: Wed, 27 Nov 2024 16:13:49 +0900
Subject: [PATCH] dockerfiles

---
 server/Dockerfile                   |  2 +-
 wsnet2-dashboard/backend/Dockerfile | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/server/Dockerfile b/server/Dockerfile
index 8aeb5bf..6158624 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.22
 
-ARG protoc_ver="24.2"
+ARG protoc_ver="27.3"
 
 RUN apt-get update && apt-get install -y unzip && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
diff --git a/wsnet2-dashboard/backend/Dockerfile b/wsnet2-dashboard/backend/Dockerfile
index aebe305..116730c 100644
--- a/wsnet2-dashboard/backend/Dockerfile
+++ b/wsnet2-dashboard/backend/Dockerfile
@@ -1,26 +1,20 @@
-FROM node:18.18.2-bullseye-slim
+FROM node:22.11.0-bookworm-slim
 
 RUN apt-get update && apt-get install -y wget make unzip && \
   apt-get clean && rm -rf /var/lib/apt/lists/* && \
   wget -O /wait-for-it.sh https://github.com/vishnubob/wait-for-it/raw/master/wait-for-it.sh > /dev/null 2>&1 && \
   chmod +x /wait-for-it.sh
 
-ARG go_ver="1.22.0"
-ARG gopherjs_ver="v1.19.0-beta1"
-ARG gopherjs_go="go1.19.13"
-ARG protoc_ver="24.2"
+ARG go_ver="1.23.3"
+ARG protoc_ver="27.3"
 
 ENV PATH=/root/go/bin:/go/bin:$PATH
-ENV GOPHERJS_GOROOT=/root/sdk/${gopherjs_go}
 
 RUN cd / && \
-  wget -O go.tar.gz https://go.dev/dl/go${go_ver}.linux-$([ $(uname -m) = aarch64 ] && echo -n arm64 || echo -n amd64).tar.gz && \
-  tar xvf go.tar.gz && \
+  wget -q -O go.tar.gz https://go.dev/dl/go${go_ver}.linux-$([ $(uname -m) = aarch64 ] && echo -n arm64 || echo -n amd64).tar.gz && \
+  tar xf go.tar.gz && \
   rm go.tar.gz && \
   go install github.com/makiuchi-d/arelo@latest && \
-  go install github.com/gopherjs/gopherjs@${gopherjs_ver} && \
-  go install golang.org/dl/${gopherjs_go}@latest && \
-  $gopherjs_go download && \
   wget -O protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v${protoc_ver}/protoc-${protoc_ver}-linux-$(if [ $(uname -m) = "aarch64" ]; then echo aarch_64; else echo x86_64; fi).zip && \
   unzip -o protoc.zip "bin/*" "include/*" -d /usr/local && \
   rm protoc.zip