diff --git a/docker/build.sh b/docker-gitlink/build.sh similarity index 100% rename from docker/build.sh rename to docker-gitlink/build.sh diff --git a/docker/config.profile b/docker-gitlink/config.profile similarity index 100% rename from docker/config.profile rename to docker-gitlink/config.profile diff --git a/docker/copy.sh b/docker-gitlink/copy.sh similarity index 100% rename from docker/copy.sh rename to docker-gitlink/copy.sh diff --git a/docker/default_docker-compose.yml b/docker-gitlink/default_docker-compose.yml similarity index 98% rename from docker/default_docker-compose.yml rename to docker-gitlink/default_docker-compose.yml index 62a35a8e2..4897829bd 100644 --- a/docker/default_docker-compose.yml +++ b/docker-gitlink/default_docker-compose.yml @@ -11,7 +11,7 @@ services: - #docker_data/nacos/logs/:/home/nacos/logs - #docker_data/nacos/conf/application.properties:/home/nacos/conf/application.properties ports: - - "23848:8848" + - "23848:8848" deploy: resources: limits: diff --git a/docker/deploy.sh b/docker-gitlink/deploy.sh similarity index 100% rename from docker/deploy.sh rename to docker-gitlink/deploy.sh diff --git a/docker/gitlink/auth/default_dockerfile b/docker-gitlink/gitlink/auth/default_dockerfile similarity index 100% rename from docker/gitlink/auth/default_dockerfile rename to docker-gitlink/gitlink/auth/default_dockerfile diff --git a/docker/gitlink/auth/jar/readme.txt b/docker-gitlink/gitlink/auth/jar/readme.txt similarity index 100% rename from docker/gitlink/auth/jar/readme.txt rename to docker-gitlink/gitlink/auth/jar/readme.txt diff --git a/docker/gitlink/base/dockerfile b/docker-gitlink/gitlink/base/dockerfile similarity index 100% rename from docker/gitlink/base/dockerfile rename to docker-gitlink/gitlink/base/dockerfile diff --git a/docker/gitlink/base/skywalking/skywalking-agent.tar.gz b/docker-gitlink/gitlink/base/skywalking/skywalking-agent.tar.gz similarity index 100% rename from docker/gitlink/base/skywalking/skywalking-agent.tar.gz rename to docker-gitlink/gitlink/base/skywalking/skywalking-agent.tar.gz diff --git a/docker/gitlink/gateway/default_dockerfile b/docker-gitlink/gitlink/gateway/default_dockerfile similarity index 100% rename from docker/gitlink/gateway/default_dockerfile rename to docker-gitlink/gitlink/gateway/default_dockerfile diff --git a/docker/gitlink/gateway/jar/readme.txt b/docker-gitlink/gitlink/gateway/jar/readme.txt similarity index 100% rename from docker/gitlink/gateway/jar/readme.txt rename to docker-gitlink/gitlink/gateway/jar/readme.txt diff --git a/docker/gitlink/modules/cms/default_dockerfile b/docker-gitlink/gitlink/modules/cms/default_dockerfile similarity index 100% rename from docker/gitlink/modules/cms/default_dockerfile rename to docker-gitlink/gitlink/modules/cms/default_dockerfile diff --git a/docker/gitlink/modules/cms/jar/readme.txt b/docker-gitlink/gitlink/modules/cms/jar/readme.txt similarity index 100% rename from docker/gitlink/modules/cms/jar/readme.txt rename to docker-gitlink/gitlink/modules/cms/jar/readme.txt diff --git a/docker/gitlink/modules/file/default_dockerfile b/docker-gitlink/gitlink/modules/file/default_dockerfile similarity index 100% rename from docker/gitlink/modules/file/default_dockerfile rename to docker-gitlink/gitlink/modules/file/default_dockerfile diff --git a/docker/gitlink/modules/file/jar/readme.txt b/docker-gitlink/gitlink/modules/file/jar/readme.txt similarity index 100% rename from docker/gitlink/modules/file/jar/readme.txt rename to docker-gitlink/gitlink/modules/file/jar/readme.txt diff --git a/docker/gitlink/modules/job/default_dockerfile b/docker-gitlink/gitlink/modules/job/default_dockerfile similarity index 100% rename from docker/gitlink/modules/job/default_dockerfile rename to docker-gitlink/gitlink/modules/job/default_dockerfile diff --git a/docker/gitlink/modules/job/jar/readme.txt b/docker-gitlink/gitlink/modules/job/jar/readme.txt similarity index 100% rename from docker/gitlink/modules/job/jar/readme.txt rename to docker-gitlink/gitlink/modules/job/jar/readme.txt diff --git a/docker/gitlink/modules/system/default_dockerfile b/docker-gitlink/gitlink/modules/system/default_dockerfile similarity index 100% rename from docker/gitlink/modules/system/default_dockerfile rename to docker-gitlink/gitlink/modules/system/default_dockerfile diff --git a/docker/gitlink/modules/system/jar/readme.txt b/docker-gitlink/gitlink/modules/system/jar/readme.txt similarity index 100% rename from docker/gitlink/modules/system/jar/readme.txt rename to docker-gitlink/gitlink/modules/system/jar/readme.txt diff --git a/docker/nacos/conf/default_application.properties b/docker-gitlink/nacos/conf/default_application.properties similarity index 99% rename from docker/nacos/conf/default_application.properties rename to docker-gitlink/nacos/conf/default_application.properties index 097c0f039..afc12e3d0 100644 --- a/docker/nacos/conf/default_application.properties +++ b/docker-gitlink/nacos/conf/default_application.properties @@ -11,11 +11,8 @@ management.metrics.export.elastic.enabled=false management.metrics.export.influx.enabled=false server.tomcat.accesslog.enabled=true server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i - server.tomcat.basedir=/home/ruoyi/nacos/tomcat/logs - nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** - nacos.core.auth.system.type=nacos nacos.core.auth.enabled=false nacos.core.auth.default.token.expire.seconds=18000 @@ -24,5 +21,4 @@ nacos.core.auth.caching.enabled=true nacos.core.auth.enable.userAgentAuthWhite=false nacos.core.auth.server.identity.key=serverIdentity nacos.core.auth.server.identity.value=security - nacos.istio.mcp.server.enabled=false diff --git a/docker/nacos/dockerfile b/docker-gitlink/nacos/dockerfile similarity index 96% rename from docker/nacos/dockerfile rename to docker-gitlink/nacos/dockerfile index 5240a975a..17cfd1780 100644 --- a/docker/nacos/dockerfile +++ b/docker-gitlink/nacos/dockerfile @@ -1,7 +1,7 @@ -# 基础镜像 -FROM nacos/nacos-server:v2.2.0 -# author -MAINTAINER gitlink - -# 复制conf文件到路径 -COPY ./conf/application.properties /home/nacos/conf/application.properties +# 基础镜像 +FROM nacos/nacos-server:v2.2.0 +# author +MAINTAINER gitlink + +# 复制conf文件到路径 +COPY ./conf/application.properties /home/nacos/conf/application.properties diff --git a/docker/nacos/sql/default_gitlink-nacos-config.sql b/docker-gitlink/nacos/sql/default_gitlink-nacos-config.sql similarity index 100% rename from docker/nacos/sql/default_gitlink-nacos-config.sql rename to docker-gitlink/nacos/sql/default_gitlink-nacos-config.sql diff --git a/docker/nginx/conf/nginx.conf b/docker-gitlink/nginx/conf/nginx.conf similarity index 93% rename from docker/nginx/conf/nginx.conf rename to docker-gitlink/nginx/conf/nginx.conf index 56bf0ca28..625603bc5 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker-gitlink/nginx/conf/nginx.conf @@ -1,36 +1,36 @@ -worker_processes 1; - -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - - server { - listen 80; - server_name localhost; - - location / { - root /home/ruoyi/projects/ruoyi-ui; - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - - location /prod-api/{ - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE-HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://ruoyi-gateway:8080/; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } +worker_processes 1; + +events { + worker_connections 1024; +} + +http { + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; + + server { + listen 80; + server_name localhost; + + location / { + root /home/ruoyi/projects/ruoyi-ui; + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + location /prod-api/{ + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://ruoyi-gateway:8080/; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + } }# requirepass 123456 \ No newline at end of file diff --git a/docker/nginx/dockerfile b/docker-gitlink/nginx/dockerfile similarity index 96% rename from docker/nginx/dockerfile rename to docker-gitlink/nginx/dockerfile index c427fcdaa..d2eb8a89e 100644 --- a/docker/nginx/dockerfile +++ b/docker-gitlink/nginx/dockerfile @@ -1,15 +1,15 @@ -# 基础镜像 -FROM nginx -# author -MAINTAINER gitlink - -# 挂载目录 -VOLUME /home/gitlink/projects/ruoyi-ui -# 创建目录 -RUN mkdir -p /home/gitlink/projects/ruoyi-ui -# 指定路径 -WORKDIR /home/gitlink/projects/ruoyi-ui -# 复制conf文件到路径 -COPY ./conf/nginx.conf /etc/nginx/nginx.conf -# 复制html文件到路径 -COPY ./html/dist /home/gitlink/projects/ruoyi-ui +# 基础镜像 +FROM nginx +# author +MAINTAINER gitlink + +# 挂载目录 +VOLUME /home/gitlink/projects/ruoyi-ui +# 创建目录 +RUN mkdir -p /home/gitlink/projects/ruoyi-ui +# 指定路径 +WORKDIR /home/gitlink/projects/ruoyi-ui +# 复制conf文件到路径 +COPY ./conf/nginx.conf /etc/nginx/nginx.conf +# 复制html文件到路径 +COPY ./html/dist /home/gitlink/projects/ruoyi-ui diff --git a/docker/redis/conf/redis.conf b/docker-gitlink/redis/conf/redis.conf similarity index 100% rename from docker/redis/conf/redis.conf rename to docker-gitlink/redis/conf/redis.conf diff --git a/docker/redis/dockerfile b/docker-gitlink/redis/dockerfile similarity index 95% rename from docker/redis/dockerfile rename to docker-gitlink/redis/dockerfile index f5446cd00..15ecdf9e8 100644 --- a/docker/redis/dockerfile +++ b/docker-gitlink/redis/dockerfile @@ -1,13 +1,13 @@ -# 基础镜像 -FROM redis:5.0 -# author -MAINTAINER gitlink - -# 挂载目录 -VOLUME /home/gitlink/redis -# 创建目录 -RUN mkdir -p /home/gitlink/redis -# 指定路径 -WORKDIR /home/gitlink/redis -# 复制conf文件到路径 -COPY ./conf/redis.conf /home/gitlink/redis/redis.conf +# 基础镜像 +FROM redis:5.0 +# author +MAINTAINER gitlink + +# 挂载目录 +VOLUME /home/gitlink/redis +# 创建目录 +RUN mkdir -p /home/gitlink/redis +# 指定路径 +WORKDIR /home/gitlink/redis +# 复制conf文件到路径 +COPY ./conf/redis.conf /home/gitlink/redis/redis.conf diff --git a/docker/nginx/html/dist/readme.txt b/docker/nginx/html/dist/readme.txt deleted file mode 100644 index 2179af784..000000000 --- a/docker/nginx/html/dist/readme.txt +++ /dev/null @@ -1 +0,0 @@ -存放前端ruoyi-ui构建好的静态文件,用于nginx请求访问。 \ No newline at end of file