Browse Source

feat: dockerfile

zhangyuting 5 years ago
parent
commit
b8c3e41492

+ 6 - 2
docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.7"
 
 services:
   image-pool-service:
@@ -7,8 +7,12 @@ services:
       dockerfile: ./src/main/docker/Dockerfile
     image: image-pool-service:latest
     container_name: image-pool-app
+    deploy:
+      resources:
+        limits:
+          memory: 2048M
     ports:
-      - "8081:8081"
+      - "8080:8080"
     restart: always
     networks:
       - backend

+ 6 - 9
src/main/docker/Dockerfile

@@ -1,8 +1,9 @@
 FROM openjdk:8u282-jdk-slim  AS builder
 
 ENV TZ=Asia/Shanghai
+ENV APP=/app
 
-WORKDIR /app
+WORKDIR ${APP}
 
 COPY . .
 
@@ -19,15 +20,11 @@ ENV TZ=Asia/Shanghai
 
 WORKDIR /app
 
-RUN adduser spring && adduser spring  spring && ls -la && pwd
-
-USER spring:spring
-
-COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+COPY --from=builder /usr/share/zoneinfo/$TZ /etc/localtime
 COPY --from=builder /app/target/*.jar /app/app.jar
 
-RUN ls -la && pwd
+RUN apt-get update && apt-get install libgtk2.0-0 -y && ls -la && pwd
 
-EXPOSE 8081
+EXPOSE 8080
 
-CMD ["java","-Xms1024m","-Xmx1024m","-jar","/app/app.jar","--server.port=8081"]
+CMD ["java","-Xms1024m","-Xmx1024m","-jar","/app/app.jar","--server.port=8080"]

+ 2 - 2
src/main/java/com/mokasz/image_pool/restful/controller/ImageController.java

@@ -25,8 +25,8 @@ public class ImageController {
   private final JdbcTemplate jdbcTemplate;
 
   @GetMapping("/")
-  public ImageSaveResponse index() throws IOException {
-    return new ImageSaveResponse("ok", 0);
+  public String index() {
+    return "{'version':'1.0.0'}";
   }
 
   private byte[] getFileBytes (MultipartFile file, String url) throws IOException {