fish 11 months ago
parent
commit
1a3d652e2a

+ 1 - 1
.ide/Dockerfile

@@ -1 +1 @@
-FROM sift-docker.pkg.coding.net/flutter-team/dev-container/dev-allinone:1.0.8-flutter
+FROM sift-docker.pkg.coding.net/flutter-team/dev-container/dev-allinone:1.0.11-flutter

+ 19 - 0
deploy/app/Dockerfile

@@ -0,0 +1,19 @@
+FROM maven:3.5-jdk-8 as base
+RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+COPY maven/settings.xml /root/.m2/settings.xml 
+
+FROM base as builder
+WORKDIR /app
+COPY . /app
+RUN mvn clean package && \
+    mv target/springboot-note-0.0.1-SNAPSHOT.jar /app/target/springboot-note-0.0.1-SNAPSHOT.jar
+
+CMD [ "/bin/bash" ]
+
+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
+EXPOSE 8080
+VOLUME [ "/app" ]
+CMD [ "java", "-jar", "target/springboot-note-0.0.1-SNAPSHOT.jar"]

+ 43 - 1
dockercompose-springboot-mysql-nginx/app/pom.xml → deploy/app/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.1.7.RELEASE</version>
 	</parent>
 
 	<properties>
@@ -23,10 +23,51 @@
 	</properties>
 
 	<dependencies>
+
 	     <dependency>
 	        <groupId>org.springframework.boot</groupId>
 	        <artifactId>spring-boot-starter-web</artifactId>
 	    </dependency>
+
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-oauth2-client</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-security</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-thymeleaf</artifactId>-->
+        <!--</dependency>-->
+
+
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.session</groupId>-->
+        <!--<artifactId>spring-session-core</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+        <!--<groupId>mysql</groupId>-->
+        <!--<artifactId>mysql-connector-java</artifactId>-->
+        <!--<scope>runtime</scope>-->
+        <!--</dependency>-->
+
+        <!--配置文件处理器-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -45,6 +86,7 @@
 	<build>
 		<defaultGoal>compile</defaultGoal>
 		<plugins>
+		<!-- springboot打包可执行的jar包 -->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>

+ 0 - 0
dockercompose-springboot-mysql-nginx/app/src/main/java/com/neo/ComposeApplication.java → deploy/app/src/main/java/com/neo/ComposeApplication.java


+ 0 - 0
dockercompose-springboot-mysql-nginx/app/src/main/java/com/neo/controller/VisitorController.java → deploy/app/src/main/java/com/neo/controller/VisitorController.java


+ 0 - 0
dockercompose-springboot-mysql-nginx/app/src/main/java/com/neo/entity/Visitor.java → deploy/app/src/main/java/com/neo/entity/Visitor.java


+ 0 - 0
dockercompose-springboot-mysql-nginx/app/src/main/java/com/neo/repository/VisitorRepository.java → deploy/app/src/main/java/com/neo/repository/VisitorRepository.java


+ 0 - 0
dockercompose-springboot-mysql-nginx/app/src/main/resources/application-dev.properties → deploy/app/src/main/resources/application-dev.properties


+ 0 - 0
dockercompose-springboot-mysql-nginx/app/src/main/resources/application-docker.properties → deploy/app/src/main/resources/application-docker.properties


+ 0 - 0
dockercompose-springboot-mysql-nginx/app/src/main/resources/application.properties → deploy/app/src/main/resources/application.properties


+ 0 - 0
dockercompose-springboot-mysql-nginx/app/src/test/java/com/neo/ComposeApplicationTests.java → deploy/app/src/test/java/com/neo/ComposeApplicationTests.java


+ 43 - 0
deploy/docker-compose.debug.yaml

@@ -0,0 +1,43 @@
+version: '3'
+
+services:
+  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
+    
+  app:
+    restart: always
+    build:
+      context: ./deploy/app
+      dockerfile: Dockerfile
+    image: 
+    container_name: v-app
+
+    working_dir: /app
+    volumes:
+      - ./app:/app
+      - ~/.m2:/root/.m2
+    expose:
+      - "8080"
+    depends_on:
+      - nginx
+      - mysql
+    command: mvn clean spring-boot:run -Dspring-boot.run.profiles=docker
+
+networks:
+  default:
+    external:
+      name: v-net
+  
+volumes:
+  mysql_data:
+    driver: local
+  app_data:
+    driver: local

+ 0 - 0
dockercompose-springboot-mysql-nginx/docker-compose.yaml → deploy/docker-compose.yaml


+ 0 - 0
deploy/maven/settings.xml


+ 0 - 0
deploy/mysql/note.sql


+ 0 - 0
dockercompose-springboot-mysql-nginx/nginx/conf.d/app.conf → deploy/nginx/conf.d/app.conf


+ 0 - 1
dockercompose-springboot-mysql-nginx/app/Dockerfile

@@ -1 +0,0 @@
-FROM maven:3.5-jdk-8

+ 2 - 0
docs/README.md

@@ -0,0 +1,2 @@
+# docs
+