camera_merge
王一鸣 6 years ago
parent cb76c67b3d
commit 31ab3ee863

@ -1 +0,0 @@
springbootstart

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="common" />
<module name="filter" />
<module name="springbootstart-web" />
</profile>
</annotationProcessing>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="filter" options="-parameters" />
<module name="springbootstart-web" options="-parameters" />
</option>
</component>
</project>

@ -2,9 +2,5 @@
<project version="4"> <project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM"> <component name="Encoding" addBOMForNewFiles="with NO BOM">
<file url="file://$PROJECT_DIR$" charset="UTF-8" /> <file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/common" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/filter" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/web" charset="UTF-8" />
</component> </component>
</project> </project>

@ -1,22 +1,22 @@
--- ---
- name: Ensures /home/work/springbootstart/springbootstart_backend_test dir exists - name: Ensures /home/work/lia/duoji_test dir exists
file: path=/home/work/springbootstart/springbootstart_backend_test state=directory file: path=/home/work/lipo/duoji_test state=directory
- name: stop admin Service - name: stop admin Service
shell: docker-compose -f /home/work/springbootstart/springbootstart_backend_test/docker-compose.yml down shell: docker-compose -f /home/work/lia/duoji_test/docker-compose.yml down
ignore_errors: True ignore_errors: True
- name: copy admin docker-compose.yml - name: copy admin docker-compose.yml
copy: copy:
src: docker-compose.yml src: docker-compose.yml
dest: /home/work/springbootstart/springbootstart_backend_test/docker-compose.yml dest: /home/work/lia/duoji_test/docker-compose.yml
backup: yes backup: yes
- name: docker-pull - name: docker-pull
shell: docker pull {{ DOCKER_REPO }}/{{ IMAGE }} && docker tag {{ DOCKER_REPO }}/{{ IMAGE }} {{ IMAGE }} && docker rmi {{ DOCKER_REPO }}/{{ IMAGE }} shell: docker pull {{ DOCKER_REPO }}/{{ IMAGE }} && docker tag {{ DOCKER_REPO }}/{{ IMAGE }} {{ IMAGE }} && docker rmi {{ DOCKER_REPO }}/{{ IMAGE }}
- name: modify docker-compose.yml - name: modify docker-compose.yml
shell: cd /home/work/springbootstart/springbootstart_backend_test && sed -i "s/springbootstart:1.0.0/{{ IMAGE }}/g" docker-compose.yml shell: cd /home/work/lia/duoji_test && sed -i "s/springbootstart:1.0.0/{{ IMAGE }}/g" docker-compose.yml
- name: start Service - name: start Service
shell: docker-compose -f /home/work/springbootstart/springbootstart_backend_test/docker-compose.yml up -d shell: docker-compose -f /home/work/lia/duoji_test/docker-compose.yml up -d

@ -1 +1 @@
192.168.1.232 192.168.26.214

@ -1,6 +1,6 @@
--- ---
- name: deploy springbootstart - name: deploy springbootstart
hosts: all hosts: all
remote_user: work remote_user: root
roles: roles:
- springbootstart-test - springbootstart-test

Loading…
Cancel
Save