Merge pull request #32 from paulophgf/bugfix/docker-compose

- Updated docker compose configuration
paulophgf · Jan 25, 2023 · 60d8cfb · 60d8cfb
2 parents 17ced71 + 2897fc7
commit 60d8cfb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -700,16 +700,15 @@ services:
       - "8088:8088"
     volumes:
       - /etc/hosts:/etc/hosts:ro
-      - {LOCAL_DIR}:/filehub # Replace the variable {LOCAL_DIR}
+      - {LOCAL_DIR}:/filehub # Replace the variable {LOCAL_DIR} | e.g. Win: C:\Users\%user%\filehub or Linux: /filehub
     environment:
-      CONFIG_TYPE: "[LOCAL_FILE | GIT_FILE]" # Choose one option
-      LOCAL_FILE_PATH: "{LOCAL_DIR_PATH}" # Replace the variable {LOCAL_DIR_PATH}
-      CONFIG_GIT_FILE_PATH: "{GIT_FILE_URL}" # Replace the variable {GIT_FILE_URL}
-      CONFIG_GIT_FILE_TOKEN: "{GIT_FILE_TOKEN}" # Replace the variable {GIT_FILE_TOKEN}
+      CONFIG_TYPE: "LOCAL_FILE" # Choose one option LOCAL_FILE or GIT_FILE
+      LOCAL_FILE_PATH: "filehub/fh-config.xml"
+      CONFIG_GIT_FILE_PATH: "" # Fill the variable if you choose GIT_FILE as CONFIG_TYPE
+      CONFIG_GIT_FILE_TOKEN: "" # Fill the variable if you choose GIT_FILE as CONFIG_TYPE
       JAVA_OPTS : "-Xms512m -Xmx1024m"
 
 networks:
   filehub-default:
-    external:
-      name: filehub-default
+    name: filehub-default
 ````
diff --git a/README.pt-br.md b/README.pt-br.md
@@ -719,16 +719,15 @@ services:
       - "8088:8088"
     volumes:
       - /etc/hosts:/etc/hosts:ro
-      - {LOCAL_DIR}:/filehub # Substitua o valor da variável {LOCAL_DIR}
+      - {LOCAL_DIR}:/filehub # Substitua o valor da variável {LOCAL_DIR} | Exemplos: Win: C:\Users\%user%\filehub ou Linux: /filehub
     environment:
-      CONFIG_TYPE: "[LOCAL_FILE | GIT_FILE]" # Escolha umas das opções
-      LOCAL_FILE_PATH: "{LOCAL_DIR_PATH}" # Substitua o valor da variável {LOCAL_DIR_PATH}
-      CONFIG_GIT_FILE_PATH: "{GIT_FILE_URL}" # Substitua o valor da variável {GIT_FILE_URL}
-      CONFIG_GIT_FILE_TOKEN: "{GIT_FILE_TOKEN}" # Substitua o valor da variável {GIT_FILE_TOKEN}
+      CONFIG_TYPE: "LOCAL_FILE" # Escolha umas das opções LOCAL_FILE ou GIT_FILE
+      LOCAL_FILE_PATH: "filehub/fh-config.xml"
+      CONFIG_GIT_FILE_PATH: "" # Preencha esta variável caso tenha escolhido GIT_FILE como CONFIG_TYPE
+      CONFIG_GIT_FILE_TOKEN: "" # Preencha esta variável caso tenha escolhido GIT_FILE como CONFIG_TYPE
       JAVA_OPTS : "-Xms512m -Xmx1024m"
 
 networks:
   filehub-default:
-    external:
-      name: filehub-default
+    name: filehub-default
 ````
diff --git a/src/main/java/br/com/p8projects/filehub/system/SystemBoot.java b/src/main/java/br/com/p8projects/filehub/system/SystemBoot.java
@@ -48,7 +48,7 @@ private void showSystemInfo() {
                 "\nVersion: " + properties.getSystemVersion() +
                 "\nStorage Reader Type: " + properties.getConfigType() +
                 "\nAPI Documentation: http://localhost:" + properties.getAppPort() + "/swagger-ui/index.html" +
-                "\nSwagger API Code: http://localhost:" + properties.getAppPort() + "/v2/api-docs";
+                "\nSwagger API Raw: http://localhost:" + properties.getAppPort() + "/v2/api-docs";
         logger.info(logo);
     }