Skip to content

Commit 7d35f83

Browse files
authored
Merge pull request #125 from dromara/dev
🐳 修改 docker 配置.
2 parents f1a4e04 + ef9c34f commit 7d35f83

File tree

9 files changed

+9
-7
lines changed

9 files changed

+9
-7
lines changed

docker/adminer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM --platform=$BUILDPLATFORM adminer:latest
1+
FROM --platform=$TARGETPLATFORM adminer:latest

docker/builder/Dockerfile.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#FROM --platform=$BUILDPLATFORM maven:3.9.10-eclipse-temurin-8-alpine AS builder
12
FROM maven:3.9.10-eclipse-temurin-8-alpine AS builder
23

34
# 设置阿里云镜像加速

docker/builder/Dockerfile.ui

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#FROM --platform=$BUILDPLATFORM node:18-alpine AS builder
12
FROM node:18-alpine AS builder
23

34
# 设置阿里云镜像加速

docker/docker-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function modify_dockerfiles() {
115115
if [ -f "$file" ]; then
116116
echo "备份并修改: $file"
117117
cp "$file" "$file$backup_suffix"
118-
sed -i 's/--platform=\$BUILDPLATFORM//g' "$file"
118+
sed -i 's/--platform=\TARGETPLATFORM//g' "$file"
119119
else
120120
echo "文件不存在 -> $file"
121121
fi

docker/guacd/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM guacamole/guacd:1.6.0
1+
FROM --platform=$TARGETPLATFORM guacamole/guacd:1.6.0
22

33
USER root
44

docker/mysql/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM mysql:8.0.28
1+
FROM --platform=$TARGETPLATFORM mysql:8.0.28
22

33
# 系统时区
44
ARG TZ=Asia/Shanghai

docker/redis/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM redis:6.0.16-alpine
1+
FROM --platform=$TARGETPLATFORM redis:6.0.16-alpine
22

33
WORKDIR /data
44

docker/service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM openjdk:8-jdk-alpine
1+
FROM --platform=$TARGETPLATFORM openjdk:8-jdk-alpine
22

33
USER root
44

docker/ui/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM nginx:alpine
1+
FROM --platform=$TARGETPLATFORM nginx:alpine
22

33
# 系统时区
44
ARG TZ=Asia/Shanghai

0 commit comments

Comments
 (0)