From 3996673d9f8331ca8feb5d92b16ab7bd7d39df88 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 19 Jul 2024 20:27:27 +0300
Subject: [PATCH] Fix build system

---
 rsconcept/backend/Dockerfile    |  3 ++-
 rsconcept/frontend/Dockerfile   |  2 +-
 scripts/dev/PopulateDevData.ps1 | 13 +------------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/rsconcept/backend/Dockerfile b/rsconcept/backend/Dockerfile
index 6ae01cab..4a5521d9 100644
--- a/rsconcept/backend/Dockerfile
+++ b/rsconcept/backend/Dockerfile
@@ -65,9 +65,10 @@ RUN pip install --no-cache /wheels/* && \
     rm -rf /wheels
 
 # Copy application sources and setup permissions
-COPY apps/ ./apps
 COPY project/ ./project
+COPY shared/ ./shared
 COPY fixtures/ ./fixtures
+COPY apps/ ./apps
 COPY manage.py entrypoint.sh ./
 RUN sed -i 's/\r$//g'  $APP_HOME/entrypoint.sh && \
     chmod +x $APP_HOME/entrypoint.sh && \
diff --git a/rsconcept/frontend/Dockerfile b/rsconcept/frontend/Dockerfile
index 50975a59..88ded660 100644
--- a/rsconcept/frontend/Dockerfile
+++ b/rsconcept/frontend/Dockerfile
@@ -1,5 +1,5 @@
 # ======== Multi-stage base ==========
-FROM node:bullseye-slim AS node-base
+FROM node:20-bullseye-slim AS node-base
 RUN apt-get update -qq && \
     apt-get upgrade -y && \
     rm -rf /var/lib/apt/lists/*
diff --git a/scripts/dev/PopulateDevData.ps1 b/scripts/dev/PopulateDevData.ps1
index 6db22c8d..d217ad07 100644
--- a/scripts/dev/PopulateDevData.ps1
+++ b/scripts/dev/PopulateDevData.ps1
@@ -2,25 +2,14 @@
 # FOR DEVELOPEMENT BUILDS ONLY!
 $container= Read-Host -Prompt "Enter backend container name: "
 
-$backend = Resolve-Path -Path "$PSScriptRoot\..\..\rsconcept\backend"
-
 function PopulateDevData() {
     ImportInitialData
-    CreateAdmin
 }
 
 function ImportInitialData() {
     docker exec `
         -it $container `
-        python3.12 manage.py loaddata $backend\fixtures\InitialData.json
-}
-
-function CreateAdmin() {
-    docker exec `
-        -e DJANGO_SUPERUSER_USERNAME=admin `
-        -e DJANGO_SUPERUSER_PASSWORD=1234 `
-        -e DJANGO_SUPERUSER_EMAIL=admin@admin.com `
-        -it $container python3.12 manage.py createsuperuser --noinput
+        python3.12 manage.py loaddata ./fixtures/InitialData.json
 }
 
 PopulateDevData