Conflicts:
	src/main/resources/application.yaml
This commit is contained in:
yang.xie 2022-11-06 11:42:52 +08:00
commit cb1f1007b3
3 changed files with 36 additions and 9 deletions

View File

@ -1,8 +1,7 @@
# yaml 配置实例
version: '3' version: '3'
services: services:
web: web:
image: usvisartrackapi:0.0.2-snapshot image: repo-docker.ossez.com/docker-hub/usvisartrackapi:0.0.3-SNAPSHOT
container_name: usvisatrackapi container_name: usvisatrackapi
restart: unless-stopped restart: unless-stopped
ports: ports:
@ -12,6 +11,4 @@ services:
- APP_DATABASE_PORT=3306 - APP_DATABASE_PORT=3306
- APP_DATABASE_NAME=usvisatrack - APP_DATABASE_NAME=usvisatrack
- APP_DATABASE_USERNAME=root - APP_DATABASE_USERNAME=root
- APP_DATABASE_PASSWORD=ETNN0sqc1qMbgQaeGKWL - APP_DATABASE_PASSWORD=ETNN0sqc1qMbgQaeGKWL
- CRAWL_USEPROXY=true

30
deploy/site.yml Normal file
View File

@ -0,0 +1,30 @@
# This is your main playbook you will run with:
# ansible-playbook site.yml
# You can kick off everything from this playbook.
# Or, you can create separate playbooks in this directory for specific orchestration events.
---
- name: apply common configuration to all nodes
hosts: all
# user: root
tasks:
- name: copy file at root dir of flash in slot 3 of sw1(ios)
ansible.builtin.copy:
src: docker-compose.yaml
dest: /home/app/usvisatrackapi/docker-compose.yaml
- name: Docker Pull
ansible.builtin.shell:
cmd: sudo docker compose pull
chdir: /home/app/usvisatrackapi/
- name: Docker Remove Orphans
ansible.builtin.shell:
cmd: docker compose up -d --remove-orphans
chdir: /home/app/usvisatrackapi/
# - name: Docker Image Prune
# ansible.builtin.shell:
# cmd: docker image prune
# chdir: /home/app/usvisatrackapi/

View File

@ -46,12 +46,12 @@ public class SpringDocConfig {
return new OpenAPI().components(components) return new OpenAPI().components(components)
.info(new Info() .info(new Info()
.title(applicationTitle) .title(applicationTitle)
.description("Us Visa Track API") .description("UsVisaTrack API")
.version("v" + applicationVerison) .version("v" + applicationVerison)
.license(new License().name("Apache 2.0").url("https://www.apache.org/licenses/LICENSE-2.0"))) .license(new License().name("MIT License").url("https://opensource.org/licenses/mit-license.php")))
.externalDocs(new ExternalDocumentation() .externalDocs(new ExternalDocumentation()
.description("Us Visa Track API Documentation") .description("UsVisaTrack API Support and Documentation")
.url("https://about.gitlab.com/")) .url("https://www.visafn.com/"))
.addSecurityItem(securityRequirement); .addSecurityItem(securityRequirement);
} }