From bbf899ca7e0555b02dbf82c02d6e41a1cd8d92ac Mon Sep 17 00:00:00 2001
From: Gurkengewuerz <niklas@schuetrumpf.net>
Date: Sat, 18 Mar 2023 01:27:20 +0100
Subject: [PATCH] feat: use a more up to date nitro version

---
 README.md        |  1 +
 nitro/Dockerfile | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b93f891..b693b3b 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@ Nitro docker is a quick-to-setup docker environment for the [nitro client](https
 The default configuration can run on localhost.
 
 **This Repository uses `ms4/dev` branch!**
+**This Repository uses a [forked version](https://git.gurkengewuerz.de/nitro/nitro) of Nitro with bug-fixes and more features!**
 
 ## Requirements
 - Install docker desktop (and for windows, enable WSL support) [from here](https://www.docker.com/get-started/).
diff --git a/nitro/Dockerfile b/nitro/Dockerfile
index 3e9ef9c..837caeb 100644
--- a/nitro/Dockerfile
+++ b/nitro/Dockerfile
@@ -1,16 +1,17 @@
 FROM node:lts-alpine as builder
 
-ARG BRANCH=dev
+ARG BRANCH=main
 
 WORKDIR /build
 
 RUN apk add --no-cache git
-RUN git clone --branch ${BRANCH} --recurse-submodules https://github.com/billsonnn/nitro-react.git .
-RUN yarn install
-RUN yarn build
+RUN git clone --branch ${BRANCH} --recurse-submodules https://github.com/Gurkengewuerz/nitro.git .
+RUN npm install --force
+RUN npm install --save-dev nx
+RUN npx nx build frontend
 
 
 
 FROM nginx:alpine
 
-COPY --from=builder /build/dist/ /usr/share/nginx/html/
+COPY --from=builder /build/dist/apps/frontend/ /usr/share/nginx/html/