diff --git a/docker/adminer/Dockerfile b/docker/adminer/Dockerfile index b93cae46..961f7b1f 100644 --- a/docker/adminer/Dockerfile +++ b/docker/adminer/Dockerfile @@ -1 +1 @@ -FROM --platform=$BUILDPLATFORM adminer:latest +FROM --platform=$TARGETPLATFORM adminer:latest diff --git a/docker/builder/Dockerfile.service b/docker/builder/Dockerfile.service index 3ca3d34e..3d09032a 100644 --- a/docker/builder/Dockerfile.service +++ b/docker/builder/Dockerfile.service @@ -1,3 +1,4 @@ +#FROM --platform=$BUILDPLATFORM maven:3.9.10-eclipse-temurin-8-alpine AS builder FROM maven:3.9.10-eclipse-temurin-8-alpine AS builder # 设置阿里云镜像加速 diff --git a/docker/builder/Dockerfile.ui b/docker/builder/Dockerfile.ui index cc458006..b0e40a9a 100644 --- a/docker/builder/Dockerfile.ui +++ b/docker/builder/Dockerfile.ui @@ -1,3 +1,4 @@ +#FROM --platform=$BUILDPLATFORM node:18-alpine AS builder FROM node:18-alpine AS builder # 设置阿里云镜像加速 diff --git a/docker/docker-build.sh b/docker/docker-build.sh index 9125b84a..0b18e41d 100644 --- a/docker/docker-build.sh +++ b/docker/docker-build.sh @@ -115,7 +115,7 @@ function modify_dockerfiles() { if [ -f "$file" ]; then echo "备份并修改: $file" cp "$file" "$file$backup_suffix" - sed -i 's/--platform=\$BUILDPLATFORM//g' "$file" + sed -i 's/--platform=\TARGETPLATFORM//g' "$file" else echo "文件不存在 -> $file" fi diff --git a/docker/guacd/Dockerfile b/docker/guacd/Dockerfile index 310f7abd..48d6ba7a 100644 --- a/docker/guacd/Dockerfile +++ b/docker/guacd/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM guacamole/guacd:1.6.0 +FROM --platform=$TARGETPLATFORM guacamole/guacd:1.6.0 USER root diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile index 79874967..d8436866 100644 --- a/docker/mysql/Dockerfile +++ b/docker/mysql/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM mysql:8.0.28 +FROM --platform=$TARGETPLATFORM mysql:8.0.28 # 系统时区 ARG TZ=Asia/Shanghai diff --git a/docker/redis/Dockerfile b/docker/redis/Dockerfile index 251240a3..03436e0e 100644 --- a/docker/redis/Dockerfile +++ b/docker/redis/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM redis:6.0.16-alpine +FROM --platform=$TARGETPLATFORM redis:6.0.16-alpine WORKDIR /data diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile index 5bddabf8..25f3c2fd 100644 --- a/docker/service/Dockerfile +++ b/docker/service/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM openjdk:8-jdk-alpine +FROM --platform=$TARGETPLATFORM openjdk:8-jdk-alpine USER root diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile index ce02e252..6abe6e8e 100644 --- a/docker/ui/Dockerfile +++ b/docker/ui/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM nginx:alpine +FROM --platform=$TARGETPLATFORM nginx:alpine # 系统时区 ARG TZ=Asia/Shanghai