Commit f388fe0b authored by yaoke.yk's avatar yaoke.yk

he提交的代码还原配置

parent a37d46f8
ARG NODE_IMAGE=node:20-bookworm-slim
ARG NGINX_IMAGE=nginx:alpine
FROM ${NODE_IMAGE} AS builder
FROM docker.m.daocloud.io/library/node:20-alpine AS builder
WORKDIR /app
......@@ -15,7 +12,7 @@ ENV VITE_API_BASE_URL=${VITE_API_BASE_URL}
RUN npm run build
FROM ${NGINX_IMAGE}
FROM docker.m.daocloud.io/library/nginx:1.27-alpine
COPY nginx.conf /etc/nginx/conf.d/default.conf
COPY --from=builder /app/dist /usr/share/nginx/html
......
......@@ -19,18 +19,7 @@ server {
proxy_set_header X-Forwarded-Proto $scheme;
}
location = /index.html {
add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate" always;
try_files /index.html =404;
}
location /assets/ {
add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate" always;
try_files $uri =404;
}
location / {
add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate" always;
try_files $uri $uri/ /index.html;
}
}
......@@ -6,35 +6,8 @@ $frontendDir = Join-Path $root "doc\html"
$adminDir = Join-Path $root "yaoai-admin-web"
$mavenCmd = Join-Path $root ".tools\apache-maven-3.9.6\bin\mvn.cmd"
$jdk17Candidates = @(
"C:\Program Files\Eclipse Adoptium\jdk-17.0.19.10-hotspot",
"C:\Program Files\Eclipse Adoptium\jdk-17.0.17.10-hotspot",
"C:\Program Files\Eclipse Adoptium\jdk-17",
"C:\Program Files\Java\jdk-17",
"D:\Program Files\Java\jdk-17"
)
$jdk17Home = $jdk17Candidates | Where-Object { Test-Path (Join-Path $_ "bin\java.exe") } | Select-Object -First 1
if (-not $jdk17Home) {
$jdk17Home = Get-ChildItem "C:\Program Files\Eclipse Adoptium" -Directory -Filter "jdk-17*" -ErrorAction SilentlyContinue |
Sort-Object Name -Descending |
Select-Object -First 1 -ExpandProperty FullName
}
if (-not $jdk17Home -or -not (Test-Path (Join-Path $jdk17Home "bin\java.exe"))) {
throw "Java 17 JDK not found. Please install JDK 17 and set JAVA_HOME."
}
$env:JAVA_HOME = $jdk17Home
$env:PATH = "$env:JAVA_HOME\bin;$env:PATH"
if (-not (Test-Path $mavenCmd)) {
$chocoMaven = "C:\ProgramData\chocolatey\lib\maven\apache-maven-3.9.16\bin\mvn.cmd"
if (Test-Path $chocoMaven) {
$mavenCmd = $chocoMaven
}
}
Push-Location $root
try {
Write-Host "[dev] using JAVA_HOME=$env:JAVA_HOME"
Write-Host "[dev] starting infrastructure from yaoai-comic-studio/docker-compose.yml ..."
docker compose -f (Join-Path $backendDir "docker-compose.yml") up -d
......@@ -51,11 +24,9 @@ try {
Write-Host ""
Write-Host "[dev] next commands"
Write-Host " 1. build backend"
Write-Host " `$env:JAVA_HOME = `"$env:JAVA_HOME`""
Write-Host " `$env:PATH = `"`$env:JAVA_HOME\bin;`$env:PATH`""
Write-Host " & `"$mavenCmd`" -f `"$backendDir\pom.xml`" package -pl yaoai-bootstrap -am -DskipTests"
Write-Host " 2. run backend"
Write-Host " & `"$env:JAVA_HOME\bin\java.exe`" -jar `"$backendDir\yaoai-bootstrap\target\yaoai-bootstrap-0.1.0-SNAPSHOT.jar`""
Write-Host " java -jar `"$backendDir\yaoai-bootstrap\target\yaoai-bootstrap-0.1.0-SNAPSHOT.jar`""
Write-Host " 3. run frontend"
Write-Host " Set-Location `"$frontendDir`"; npm install; npm run dev"
Write-Host " 4. run admin-web"
......
......@@ -35,7 +35,6 @@ export default defineConfig(({ mode }) => {
'/admin-api': {
target: resolveBackendTarget(env),
changeOrigin: true,
rewrite: (path) => path.replace(/^\/admin-api/, '/admin'),
},
},
},
......
# ===== Stage 1: Build =====
ARG MAVEN_IMAGE=maven:3.9-eclipse-temurin-17-alpine
ARG RUNTIME_IMAGE=eclipse-temurin:17-jre-alpine
FROM ${MAVEN_IMAGE} AS builder
FROM docker.m.daocloud.io/library/maven:3.9.9-eclipse-temurin-17 AS builder
WORKDIR /workspace
......@@ -50,7 +47,7 @@ COPY . .
RUN mvn -s /root/.m2/settings.xml package -pl yaoai-bootstrap -am -DskipTests -B -ntp
# ===== Stage 2: Runtime =====
FROM ${RUNTIME_IMAGE}
FROM docker.m.daocloud.io/library/eclipse-temurin:17-jre-jammy
LABEL maintainer="YaoAI Team <yaoke251@gmail.com>"
LABEL org.opencontainers.image.title="YaoAI Comic Studio"
......@@ -63,7 +60,6 @@ ENV LANG=C.UTF-8 \
ARG APT_MIRROR=https://mirrors.tuna.tsinghua.edu.cn/ubuntu
RUN set -eux; \
if command -v apt-get >/dev/null 2>&1; then \
if [ -f /etc/apt/sources.list ]; then \
sed -i "s|http://archive.ubuntu.com/ubuntu|${APT_MIRROR}|g; s|http://security.ubuntu.com/ubuntu|${APT_MIRROR}|g" /etc/apt/sources.list; \
fi; \
......@@ -72,17 +68,10 @@ RUN set -eux; \
fi; \
apt-get -o Acquire::Retries=5 update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ffmpeg \
&& rm -rf /var/lib/apt/lists/*; \
elif command -v apk >/dev/null 2>&1; then \
apk add --no-cache ffmpeg; \
fi
&& rm -rf /var/lib/apt/lists/*
# Non-root user
RUN if command -v groupadd >/dev/null 2>&1; then \
groupadd -r yaoai && useradd -r -g yaoai yaoai; \
else \
addgroup -S yaoai && adduser -S -G yaoai yaoai; \
fi
RUN groupadd -r yaoai && useradd -r -g yaoai yaoai
WORKDIR /app
......
......@@ -5,30 +5,9 @@
@setlocal
@REM ==== START VALIDATION ====
@REM Prefer Java 17 even when PATH or JAVA_HOME points to an older JDK.
for /d %%J in ("C:\Program Files\Eclipse Adoptium\jdk-17*") do (
if exist "%%~fJ\bin\java.exe" (
set "JAVA_HOME=%%~fJ"
)
)
for /d %%J in ("C:\Program Files\Java\jdk-17*") do (
if exist "%%~fJ\bin\java.exe" (
set "JAVA_HOME=%%~fJ"
)
)
for /d %%J in ("D:\Program Files\Java\jdk-17*") do (
if exist "%%~fJ\bin\java.exe" (
set "JAVA_HOME=%%~fJ"
)
)
if not "%JAVA_HOME%"=="" goto OkJHome
@REM Try common Java 17 locations on this machine
if exist "C:\Program Files\Eclipse Adoptium\jdk-17.0.19.10-hotspot\bin\java.exe" (
set "JAVA_HOME=C:\Program Files\Eclipse Adoptium\jdk-17.0.19.10-hotspot"
goto OkJHome
)
if exist "D:\Program Files\Java\jdk-17\bin\java.exe" (
set "JAVA_HOME=D:\Program Files\Java\jdk-17"
goto OkJHome
......@@ -61,14 +40,6 @@ set _JAVACMD=%JAVA_HOME%\bin\java.exe
set MAVEN_WRAPPER_JAR=%~dp0.mvn\wrapper\maven-wrapper.jar
set MAVEN_WRAPPER_PROPERTIES=%~dp0.mvn\wrapper\maven-wrapper.properties
@REM Use locally installed Maven when the wrapper jar is not checked in.
if not exist "%MAVEN_WRAPPER_JAR%" (
if exist "C:\ProgramData\chocolatey\lib\maven\apache-maven-3.9.16\bin\mvn.cmd" (
call "C:\ProgramData\chocolatey\lib\maven\apache-maven-3.9.16\bin\mvn.cmd" %*
exit /B %ERRORLEVEL%
)
)
@REM Download wrapper jar if missing
if not exist "%MAVEN_WRAPPER_JAR%" (
echo Downloading Maven Wrapper...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment