Bugfix: pipeline
This commit is contained in:
parent
4600e9f398
commit
2e58dc0570
2 changed files with 7 additions and 11 deletions
|
@ -3,6 +3,9 @@ stages:
|
||||||
- deploy-dry
|
- deploy-dry
|
||||||
- deploy
|
- deploy
|
||||||
|
|
||||||
|
variables:
|
||||||
|
GIT_SUBMODULE_STRATEGY: recursive
|
||||||
|
|
||||||
ansible-lint:
|
ansible-lint:
|
||||||
image: willhallonline/ansible:2.9-ubuntu-20.04
|
image: willhallonline/ansible:2.9-ubuntu-20.04
|
||||||
stage: lint
|
stage: lint
|
||||||
|
@ -34,7 +37,7 @@ ansible-deploy-dry:
|
||||||
- echo "$id_rsa_ansible_user" > /builds/mg/ansible/id_rsa_ansible_user
|
- echo "$id_rsa_ansible_user" > /builds/mg/ansible/id_rsa_ansible_user
|
||||||
- chmod 0400 /builds/mg/ansible/id_rsa_ansible_user
|
- chmod 0400 /builds/mg/ansible/id_rsa_ansible_user
|
||||||
script:
|
script:
|
||||||
- ansible-playbook playbooks/base/0_master.yml playbooks/service/* -i inventory --check --limit production --vault-password-file $ansible_vault_pass
|
- ansible-playbook playbooks/base/0_master.yml playbooks/service/* -i inventory --check --limit test --vault-password-file $ansible_vault_pass
|
||||||
after_script:
|
after_script:
|
||||||
- rm /builds/mg/ansible/id_rsa_ansible_user
|
- rm /builds/mg/ansible/id_rsa_ansible_user
|
||||||
rules:
|
rules:
|
||||||
|
|
|
@ -15,13 +15,6 @@
|
||||||
gitlab_runner_runners:
|
gitlab_runner_runners:
|
||||||
- name: "{{ ansible_hostname }}-docker"
|
- name: "{{ ansible_hostname }}-docker"
|
||||||
executor: docker
|
executor: docker
|
||||||
docker_image: 'alpine'
|
# docker_image: 'alpine'
|
||||||
docker_volumes:
|
# docker_volumes:
|
||||||
- "/var/run/docker.sock:/var/run/docker.sock"
|
# - "/var/run/docker.sock:/var/run/docker.sock"
|
||||||
### oefenweb.ufw
|
|
||||||
ufw_rules:
|
|
||||||
- rule: allow
|
|
||||||
to_port: 22
|
|
||||||
protocol: tcp
|
|
||||||
comment: 'ssh'
|
|
||||||
from_ip: 192.168.2.0/24
|
|
||||||
|
|
Loading…
Reference in a new issue