1.6

.github/workflows/build.yml

@@ -2,9 +2,8 @@ name: EstablishDockerImage
 
 on:
   push:
-    branches:
+    tags:
-      - main
+      - "*"
-      - dev
 
 env:
   IMAGE_FQDN: registry.cn-hangzhou.aliyuncs.com/playedu/light
@@ -34,4 +33,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ${{ env.IMAGE_FQDN }}:1.4
+            ${{ env.IMAGE_FQDN }}:${{ github.ref_name }}

Dockerfile

@@ -1,19 +1,3 @@
-FROM eclipse-temurin:17 as ApiBuilder
-
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y git
-
-RUN mkdir /app
-
-WORKDIR /app
-RUN git clone -b v1.4 https://github.com/PlayEdu/PlayEdu.git playedu
-
-# 编译jar包
-WORKDIR /app/playedu
-
-RUN /app/playedu/mvnw -Dmaven.test.skip=true clean package
-
 FROM node:20-alpine as NodeBuilder
 
 # install git - apt-get replace with apk
@@ -23,9 +7,9 @@ RUN apk update && \
 
 # 编译后端
 WORKDIR /app
-RUN git clone -b v1.4 https://github.com/PlayEdu/backend.git backend
+RUN git clone -b 1.6 https://github.com/PlayEdu/backend.git backend
-RUN git clone -b v1.4 https://github.com/PlayEdu/frontend.git pc
+RUN git clone -b 1.6 https://github.com/PlayEdu/frontend.git pc
-RUN git clone -b v1.4 https://github.com/PlayEdu/h5.git h5
+RUN git clone -b 1.6 https://github.com/PlayEdu/h5.git h5
 
 # 编译后台
 WORKDIR /app/backend
@@ -39,9 +23,9 @@ RUN npm i && VITE_APP_URL=/api/ npm run build
 WORKDIR /app/h5
 RUN npm i && VITE_APP_URL=/api/ npm run build
 
-FROM eclipse-temurin:17
+FROM registry.cn-hangzhou.aliyuncs.com/playedu/api:1.6
 
-LABEL maintainer="0xtyz <tengyongzhi@meedu.vip>"
+LABEL maintainer="滕勇志 <tengyongzhi@meedu.vip>"
 
 # 使用东八区时间环境
 RUN echo "Asia/Shanghai" > /etc/timezone
@@ -49,11 +33,9 @@ RUN echo "Asia/Shanghai" > /etc/timezone
 #安装基本组件
 RUN apt update && apt install -y nginx
 
-RUN mkdir /app
-
 COPY docker/start.sh /app/api/start.sh
 
-COPY --from=ApiBuilder /app/playedu/playedu-api/target/playedu-api.jar /app/api/app.jar
+RUN mv /app/app.jar /app/api/app.jar
 
 COPY --from=NodeBuilder /app/backend/dist /app/backend
 COPY --from=NodeBuilder /app/pc/dist /app/frontend

README.md

@@ -7,7 +7,12 @@
 在命令行中执行：
 
 ```
-docker run -d -p 9700:80 -p 9800:9800 -p 9801:9801 -p 9900:9900 --name playedu-light \
+docker run -d --restart=always \
+  --name playedu-light \
+  -p 9700:80 \
+  -p 9800:9800 \
+  -p 9801:9801 \
+  -p 9900:9900 \
   -e DB_HOST=数据库host \
   -e DB_PORT=数据库端口 \
   -e DB_NAME=数据库名 \
@@ -16,7 +21,10 @@ docker run -d -p 9700:80 -p 9800:9800 -p 9801:9801 -p 9900:9900 --name playedu-l
   -e REDIS_HOST=Redis的host \
   -e REDIS_PORT=Redis的端口 \
   -e REDIS_PASS=redis的密码 \
-  registry.cn-hangzhou.aliyuncs.com/playedu/light:1.3
+  -e REDIS_DB=2 \
+  -e SA_TOKEN_IS_CONCURRENT=false \
+  -e SA_TOKEN_JWT_SECRET_KEY=playeduxyz \
+  registry.cn-hangzhou.aliyuncs.com/playedu/light:1.6
 ```
 
 跑起来之后，可以通过下面的链接访问前后台：

docker/start.sh

@@ -2,4 +2,4 @@
 
 nginx
 
-java -jar /app/api/app.jar --spring.profiles.active=prod --spring.datasource.url="jdbc:mysql://${DB_HOST}:${DB_PORT:-3306}/${DB_NAME}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false" --spring.datasource.username=${DB_USER} --spring.datasource.password=${DB_PASS} --spring.data.redis.host=${REDIS_HOST} --spring.data.redis.port=${REDIS_PORT} --spring.data.redis.password=${REDIS_PASS} --spring.data.redis.database=${REDIS_DB:-0} --sa-token.is-concurrent=${SA_TOKEN_IS_CONCURRENT:-false} --sa-token.jwt-secret-key=${SA_TOKEN_JWT_SECRET_KEY:-playeduxyz}
+java -jar /app/api/app.jar --spring.profiles.active=prod --spring.datasource.url="jdbc:mysql://${DB_HOST}:${DB_PORT:-3306}/${DB_NAME}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true" --spring.datasource.username=${DB_USER} --spring.datasource.password=${DB_PASS} --spring.data.redis.host=${REDIS_HOST} --spring.data.redis.port=${REDIS_PORT} --spring.data.redis.password=${REDIS_PASS} --spring.data.redis.database=${REDIS_DB:-0} --sa-token.is-concurrent=${SA_TOKEN_IS_CONCURRENT:-false} --sa-token.jwt-secret-key=${SA_TOKEN_JWT_SECRET_KEY:-playeduxyz}