diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd4d3c1..5d2e6bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,4 +34,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - ${{ env.IMAGE_FQDN }}:1.4 + ${{ env.IMAGE_FQDN }}:1.5 diff --git a/Dockerfile b/Dockerfile index 5cb6be1..359a83c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && \ RUN mkdir /app WORKDIR /app -RUN git clone -b v1.4 https://github.com/PlayEdu/PlayEdu.git playedu +RUN git clone -b v1.5 https://github.com/PlayEdu/PlayEdu.git playedu # 编译jar包 WORKDIR /app/playedu @@ -23,9 +23,9 @@ RUN apk update && \ # 编译后端 WORKDIR /app -RUN git clone -b v1.4 https://github.com/PlayEdu/backend.git backend -RUN git clone -b v1.4 https://github.com/PlayEdu/frontend.git pc -RUN git clone -b v1.4 https://github.com/PlayEdu/h5.git h5 +RUN git clone -b v1.5 https://github.com/PlayEdu/backend.git backend +RUN git clone -b v1.5 https://github.com/PlayEdu/frontend.git pc +RUN git clone -b v1.5 https://github.com/PlayEdu/h5.git h5 # 编译后台 WORKDIR /app/backend diff --git a/README.md b/README.md index 5914298..45502c9 100644 --- a/README.md +++ b/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.5 ``` 跑起来之后,可以通过下面的链接访问前后台: diff --git a/docker/start.sh b/docker/start.sh index 68af9fd..9084c7d 100644 --- a/docker/start.sh +++ b/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} \ No newline at end of file +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} \ No newline at end of file