Merge pull request #10107 from jumpserver/pr@dev@perf_dockerfile

perf: applet 使用 powershell 部署
pull/10118/head
Eric_Lee 2023-04-03 15:58:47 +08:00 committed by GitHub
commit 1c93d7f0a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 16 deletions

View File

@ -4,5 +4,6 @@
tasks:
- name: Install all applets
ansible.windows.win_shell:
"tinkerd install all"
ansible.windows.win_powershell:
script: |
tinkerd install all

View File

@ -6,6 +6,7 @@
tasks:
- name: Install applet
ansible.windows.win_shell:
"tinkerd install --name {{ applet_name }}"
ansible.windows.win_powershell:
script: |
tinkerd install --name {{ applet_name }}
when: applet_name != 'all'

View File

@ -143,9 +143,9 @@
dest: "{{ ansible_env.TEMP }}\\pip_packages"
- name: Install python requirements offline
ansible.windows.win_shell: >
pip install -r '{{ ansible_env.TEMP }}\pip_packages\pip_packages\requirements.txt'
--no-index --find-links='{{ ansible_env.TEMP }}\pip_packages\pip_packages'
ansible.windows.win_powershell:
script: |
pip install -r '{{ ansible_env.TEMP }}\pip_packages\pip_packages\requirements.txt' --no-index --find-links='{{ ansible_env.TEMP }}\pip_packages\pip_packages'
- name: Download chromedriver (Chromium)
ansible.windows.win_get_url:
@ -184,17 +184,18 @@
GOOGLE_DEFAULT_CLIENT_SECRET: ''
- name: Generate tinkerd component config
ansible.windows.win_shell:
"tinkerd config --hostname {{ HOST_NAME }} --core_host {{ CORE_HOST }}
--token {{ BOOTSTRAP_TOKEN }} --host_id {{ HOST_ID }} --ignore-verify-certs {{ IGNORE_VERIFY_CERTS }}"
ansible.windows.win_powershell:
tinkerd config --hostname {{ HOST_NAME }} --core_host {{ CORE_HOST }} --token {{ BOOTSTRAP_TOKEN }} --host_id {{ HOST_ID }} --ignore-verify-certs {{ IGNORE_VERIFY_CERTS }}
- name: Install tinkerd service
ansible.windows.win_shell:
"tinkerd service install"
ansible.windows.win_powershell:
script: |
tinkerd service install
- name: Start tinkerd service
ansible.windows.win_shell:
"tinkerd service start"
ansible.windows.win_powershell:
script: |
tinkerd service start
- name: Wait Tinker api health
ansible.windows.win_uri:
@ -207,5 +208,6 @@
delay: 5
- name: Sync all remote applets
ansible.windows.win_shell:
"tinkerd install all"
ansible.windows.win_powershell:
script: |
tinkerd install all