mirror of
https://github.com/IRBorisov/ConceptPortal.git
synced 2025-06-26 04:50:36 +03:00
Fix build system
This commit is contained in:
parent
6f594099a8
commit
584146fc2d
|
@ -1,7 +1,7 @@
|
||||||
# ==========================================
|
# ==========================================
|
||||||
# ============ Multi-stage build ===========
|
# ============ Multi-stage build ===========
|
||||||
# ==========================================
|
# ==========================================
|
||||||
FROM ubuntu:jammy as python-base
|
FROM ubuntu:jammy AS python-base
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ RUN apt-get update -qq && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# ========= Builder ==============
|
# ========= Builder ==============
|
||||||
FROM python-base as builder
|
FROM python-base AS builder
|
||||||
|
|
||||||
# Set env variables
|
# Set env variables
|
||||||
ENV PYTHONDONTWRITEBYTECODE 1
|
ENV PYTHONDONTWRITEBYTECODE 1
|
||||||
|
@ -65,9 +65,10 @@ RUN pip install --no-cache /wheels/* && \
|
||||||
rm -rf /wheels
|
rm -rf /wheels
|
||||||
|
|
||||||
# Copy application sources and setup permissions
|
# Copy application sources and setup permissions
|
||||||
COPY apps/ ./apps
|
|
||||||
COPY project/ ./project
|
COPY project/ ./project
|
||||||
|
COPY shared/ ./shared
|
||||||
COPY fixtures/ ./fixtures
|
COPY fixtures/ ./fixtures
|
||||||
|
COPY apps/ ./apps
|
||||||
COPY manage.py entrypoint.sh ./
|
COPY manage.py entrypoint.sh ./
|
||||||
RUN sed -i 's/\r$//g' $APP_HOME/entrypoint.sh && \
|
RUN sed -i 's/\r$//g' $APP_HOME/entrypoint.sh && \
|
||||||
chmod +x $APP_HOME/entrypoint.sh && \
|
chmod +x $APP_HOME/entrypoint.sh && \
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
# ======== Multi-stage base ==========
|
# ======== Multi-stage base ==========
|
||||||
FROM node:bullseye-slim as node-base
|
FROM node:20-bullseye-slim AS node-base
|
||||||
RUN apt-get update -qq && \
|
RUN apt-get update -qq && \
|
||||||
apt-get upgrade -y && \
|
apt-get upgrade -y && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# ======= Build =======
|
# ======= Build =======
|
||||||
ARG BUILD_TYPE=production
|
ARG BUILD_TYPE=production
|
||||||
FROM node-base as builder
|
FROM node-base AS builder
|
||||||
|
|
||||||
WORKDIR /result
|
WORKDIR /result
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ ENV NODE_ENV production
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
# ========= Server =======
|
# ========= Server =======
|
||||||
FROM node-base as product-server
|
FROM node-base AS product-server
|
||||||
|
|
||||||
ENV NODE_ENV production
|
ENV NODE_ENV production
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
# ======== Multi-stage base ==========
|
# ======== Multi-stage base ==========
|
||||||
FROM node:bullseye-slim as node-base
|
FROM node:bullseye-slim AS node-base
|
||||||
RUN apt-get update -qq && \
|
RUN apt-get update -qq && \
|
||||||
apt-get upgrade -y && \
|
apt-get upgrade -y && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# ========= Server =======
|
# ========= Server =======
|
||||||
FROM node-base as product-server
|
FROM node-base AS product-server
|
||||||
ARG BUILD_TYPE=production
|
ARG BUILD_TYPE=production
|
||||||
|
|
||||||
WORKDIR /home
|
WORKDIR /home
|
||||||
|
|
|
@ -2,25 +2,14 @@
|
||||||
# FOR DEVELOPEMENT BUILDS ONLY!
|
# FOR DEVELOPEMENT BUILDS ONLY!
|
||||||
$container= Read-Host -Prompt "Enter backend container name: "
|
$container= Read-Host -Prompt "Enter backend container name: "
|
||||||
|
|
||||||
$backend = Resolve-Path -Path "$PSScriptRoot\..\..\rsconcept\backend"
|
|
||||||
|
|
||||||
function PopulateDevData() {
|
function PopulateDevData() {
|
||||||
ImportInitialData
|
ImportInitialData
|
||||||
CreateAdmin
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function ImportInitialData() {
|
function ImportInitialData() {
|
||||||
docker exec `
|
docker exec `
|
||||||
-it $container `
|
-it $container `
|
||||||
python3.12 manage.py loaddata $backend\fixtures\InitialData.json
|
python3.12 manage.py loaddata ./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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
PopulateDevData
|
PopulateDevData
|
||||||
|
|
Loading…
Reference in New Issue
Block a user