diff --git a/docker-compose/docker-compose.yaml b/docker-compose.yaml similarity index 94% rename from docker-compose/docker-compose.yaml rename to docker-compose.yaml index 34a7010..2a0281a 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ version: "3.6" services: backend: build: - context: ./backend + context: ./ dockerfile: Dockerfile container_name: tcmonline-backend restart: always diff --git a/docker-compose/backend/Dockerfile b/docker-compose/backend/Dockerfile deleted file mode 100644 index a1c025e..0000000 --- a/docker-compose/backend/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm64v8/openjdk:11 as builder -WORKDIR /application -ARG JAR_FILE=tcmonline-admin.jar -COPY ${JAR_FILE} application.jar -RUN java -Djarmode=layertools -jar application.jar extract - -FROM arm64v8/openjdk:11 -WORKDIR /application -COPY --from=builder application/dependencies/ ./ -COPY --from=builder application/snapshot-dependencies/ ./ -COPY --from=builder application/spring-boot-loader/ ./ -COPY --from=builder application/application/ ./ -COPY docker-entrypoint.sh ./ -RUN chmod +x docker-entrypoint.sh - -# 安装Redis -RUN apt-get update && apt-get install -y redis-server - -ENTRYPOINT ["./docker-entrypoint.sh"] diff --git a/docker-compose/backend/docker-entrypoint.sh b/docker-compose/backend/docker-entrypoint.sh deleted file mode 100755 index 4488215..0000000 --- a/docker-compose/backend/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -redis-server & -java $JAVA_OPTS -server \ --XX:+UnlockExperimentalVMOptions \ --XX:+UseCGroupMemoryLimitForHeap \ --XX:-OmitStackTraceInFastThrow \ --Djava.security.egd=file:/dev/./urandom \ -org.springframework.boot.loader.JarLauncher diff --git a/docker-compose/backend/tcmonline-admin.jar b/docker-compose/backend/tcmonline-admin.jar deleted file mode 100644 index 10ae9c5..0000000 Binary files a/docker-compose/backend/tcmonline-admin.jar and /dev/null differ