From d173fcdfa3ad6f6aee721c8553f25f4db38fa302 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Thu, 5 Oct 2023 16:06:19 +0200
Subject: [chore] Convert some settings / admin panel JS to TypeScript (#2247)

* initial conversion of STUFF to typescript

* more stuff

* update babel deps, include commonjs transform

* update bundler & eslint configuration

* eslint --fix

* upgrade deps

* update docs, build stuff, peripheral stuff

---------

Co-authored-by: f0x <f0x@cthu.lu>
---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index c7bcdfcb6..d772f7497 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,12 +12,12 @@ WORKDIR /go/src/github.com/superseriousbusiness/gotosocial
 RUN swagger generate spec -o /go/src/github.com/superseriousbusiness/gotosocial/swagger.yaml --scan-models
 
 # stage 2: generate the web/assets/dist bundles
-FROM --platform=${BUILDPLATFORM} node:16.19.1-alpine3.17 AS bundler
+FROM --platform=${BUILDPLATFORM} node:18-alpine AS bundler
 
 COPY web web
-RUN yarn install --cwd web/source && \
-    BUDO_BUILD=1 node web/source  && \
-    rm -r web/source
+RUN yarn --cwd ./web/source install && \
+    yarn --cwd ./web/source build   && \
+    rm -rf ./web/source
 
 # stage 3: build the executor container
 FROM --platform=${TARGETPLATFORM} alpine:3.17.2 as executor
-- 
cgit v1.2.3