fish 11 months ago
parent
commit
f0eef57e1d
4 changed files with 82 additions and 28 deletions
  1. 7 0
      deploy/app/Dockerfile
  2. 28 2
      deploy/docker-compose.debug.yaml
  3. 31 24
      deploy/docker-compose.yaml
  4. 16 2
      scripts/build.sh

+ 7 - 0
deploy/app/Dockerfile

@@ -1,4 +1,7 @@
 FROM maven:3.5-jdk-8 as base
+FROM openjdk:8-jdk-alpine
+# FROM openjdk:17-jdk-alpine
+
 RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
 COPY maven/settings.xml /root/.m2/settings.xml 
 # ADD source dest
@@ -15,7 +18,11 @@ FROM base as runner
 # USER java
 WORKDIR /app
 COPY --from=builder /app/target/springboot-note-0.0.1-SNAPSHOT.jar /app/target/springboot-note-0.0.1-SNAPSHOT.jar
+ARG JAVA_OPTS
+ENV JAVA_OPTS=$JAVA_OPTS
+
 EXPOSE 8080
+
 VOLUME [ "/app" ]
 # CMD [ "java", "-jar", "target/springboot-note-0.0.1-SNAPSHOT.jar"]
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]

+ 28 - 2
deploy/docker-compose.debug.yaml

@@ -3,7 +3,8 @@ version: '3'
 services:
   mysql:
    container_name: v-mysql
-   image: mysql/mysql-server:5.7
+  #  image: mysql/mysql-server:5.7
+    image: mysql:5.7
    environment:
     MYSQL_DATABASE: test
     MYSQL_ROOT_PASSWORD: root
@@ -11,7 +12,32 @@ services:
    ports:
    - "3306:3306"
    restart: always
-    
+  networks:
+    - app-network
+
+  redis:
+    container_name: v-redis
+    image: redis:7.2.3
+    restart: unless-stopped
+    # volumes:
+    #   - ./redis:/data
+    ports:
+      - 6379:6379
+    networks:
+      - app-network
+
+  mongo:
+    image: mongo:latest
+    container_name: v-mongo
+    restart: always
+    # env_file: .env
+    environment:
+      - MONGO_INITDB_ROOT_USERNAME=root
+      - MONGO_INITDB_ROOT_PASSWORD=example
+    # volumes:
+    #   - mongo-data:/data/db
+    networks:
+      - app-network
   app:
     restart: always
     build:

+ 31 - 24
deploy/docker-compose.yaml

@@ -1,36 +1,43 @@
 version: '3'
 services:
   nginx:
-   container_name: v-nginx
-   image: nginx:1.13
-   restart: always
-   ports:
-   - 80:80
-   - 443:443
-   volumes:
-   - ./nginx/conf.d:/etc/nginx/conf.d
-    
+    container_name: v-nginx
+    image: nginx:1.13
+    restart: always
+    ports:
+      - 80:80
+      - 443:443
+    volumes:
+      - ./nginx/conf.d:/etc/nginx/conf.d
+  depends_on:
+    - app
+
   mysql:
-   container_name: v-mysql
-   image: mysql/mysql-server:5.7
-   environment:
-    MYSQL_DATABASE: test
-    MYSQL_ROOT_PASSWORD: root
-    MYSQL_ROOT_HOST: '%'
-   ports:
-   - "3306:3306"
-   restart: always
-    
+    container_name: v-mysql
+    image: mysql/mysql-server:5.7
+    environment:
+      MYSQL_DATABASE: test
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_ROOT_HOST: '%'
+    ports:
+      - "3306:3306"
+    restart: always
+
   app:
     restart: always
-    build: ./app
+    build:
+      context: ./app
+      dockerfile: ./Dockerfile
+    image: jianboy/springboot-note:latest
+    environment:
+      JAVA_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005,quiet=y
     working_dir: /app
     volumes:
       - ./app:/app
       - ~/.m2:/root/.m2
-    expose:
-      - "8080"
+    ports:
+      - 8080:8080
     depends_on:
-      - nginx
       - mysql
-    command: mvn clean spring-boot:run -Dspring-boot.run.profiles=docker
+      - nginx
+    command: mvn clean spring-boot:run -Dspring-boot.run.profiles=docker

+ 16 - 2
scripts/build.sh

@@ -7,10 +7,24 @@
 
 # cd 
 
-mvn clean package
 
+source /etc/profile
+export JAVA_HOME=/usr/local/openjdk-11
+export PUB_HOSTED_URL=https://pub.flutter-io.cn
+export FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn
 
-docker compose up -d -f deploy/docker-compose.debug.yaml
+# adb connect localhost:18888
 
+# android
+# cd /workspace/GOG-Android
+# chmod +x gradlew
+# ./gradlew installDebug
+# /usr/bin/env /root/.sdkman/candidates/java/21.0.1-ms/bin/java @/tmp/cp_cdacod6gzolmaikt02wpw4xj9.argfile com.neo.WebApplication
 
+# java
+mvn package
+mvn spring-boot:run
+
+# docker
+docker compose -f "deploy/docker-compose.debug.yml" up -d --build