diff --git a/.env.dev b/.env.dev new file mode 100644 index 0000000000000000000000000000000000000000..e3f3d6937a053175b3378d43deb2304eabe7f02f --- /dev/null +++ b/.env.dev @@ -0,0 +1,5 @@ +DB_NAME=itda +DB_USERNAME=root +DB_PASSWORD=itda_db +SERVER_IP=210.107.196.188 +DATASOURCE_URL=jdbc:mysql://mysql:3306/itda?createDatabaseIfNotExist=true&characterEncoding=UTF-8&characterSetResults=UTF-8 diff --git a/.gitignore b/.gitignore index 8dc77d5b58839f687349725f07a67feeb6091a4b..4ac9f8f208866152356d572e4c6856cfb1da41f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +.env data/ lego/ diff --git a/compose.yaml b/compose.yaml index 414f6ae657a44447903cf80dc8c929aae6556c65..45adf8333f110954833a395f970b8d17fce013f9 100644 --- a/compose.yaml +++ b/compose.yaml @@ -8,3 +8,37 @@ services: - '443:443' volumes: - ./data:/data + networks: + - itda_net + + backend: + image: jjjjjk12/itda_backend + restart: unless-stopped + depends_on: + - mysql + environment: + - SPRING_DATASOURCE_URL=${DATASOURCE_URL} + - SPRING_DATASOURCE_USERNAME=${DB_USERNAME} + - SPRING_DATASOURCE_PASSWORD=${DB_PASSWORD} + - SPRING_SERVER_BASE-IP=${SERVER_IP} + volumes: + - ./data:/data + networks: + - itda_net + + mysql: + image: mysql:8 + restart: unless-stopped + environment: + - MYSQL_ROOT_PASSWORD=${DB_PASSWORD} + - MYSQL_DATABASE=${DB_NAME} + volumes: + - mysql:/var/lib/mysql + networks: + - itda_net + +networks: + itda_net: {} + +volumes: + mysql: {} diff --git a/rootfs/etc/nginx/conf.d/apm.conf b/rootfs/etc/nginx/conf.d/apm.conf index ddf7b9abbc873a4954cc9b85be4d41adace30d5a..14a543fa5730f26734732b227c997bbde6506fbc 100644 --- a/rootfs/etc/nginx/conf.d/apm.conf +++ b/rootfs/etc/nginx/conf.d/apm.conf @@ -16,7 +16,7 @@ server { proxy_set_header X-Forwarded-Scheme $scheme; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://127.0.0.1:8080/; + proxy_pass http://backend:8080/api/; proxy_read_timeout 15m; proxy_send_timeout 15m; @@ -29,4 +29,4 @@ server { } try_files $uri $uri.html $uri/ /index.html; } -} \ No newline at end of file +}