Skip to content

Commit

Permalink
#667, move away from ansible timeout to env vars
Browse files Browse the repository at this point in the history
docker_services' (of ansible) timeout didn't appear to effect the
timeout in use.  Setting COMPOSE_HTTP_TIMEOUT env variable for all
docker_services use was the most important in terms of getting a
successfull response.  Added DOCKER_CLIENT_TIMEOUT as a pair to that
based on the suggestion of
docker/compose#3927 (comment)
  • Loading branch information
joshzamor committed Oct 7, 2020
1 parent 95232a2 commit 3db17cd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 2 additions & 0 deletions deploy/ansible/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
PCMT_TRAEFIK_CONF: "{{ pcmt_traefik_conf }}"
PCMT_HOSTNAME: "{{ pcmt_hostname }}"
PCMT_S3_BUCKET: "s3://{{ pcmt_hostname }}"
COMPOSE_HTTP_TIMEOUT: "120"
DOCKER_CLIENT_TIMEOUT: "120"

pre_tasks:
- include_tasks: tasks/python2-ubuntu.yml
Expand Down
2 changes: 0 additions & 2 deletions deploy/ansible/tasks/pim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
pull: no
remove_orphans: yes
state: absent
timeout: 120
when: pcmt_profile == 'dev'
- name: Prune pim volume for dev
shell: docker volume rm -f app_pim
Expand All @@ -51,7 +50,6 @@
pull: yes
remove_orphans: yes
state: present
timeout: 120
- name: Restart fpm to wipe
docker_service:
project_src: /app
Expand Down

0 comments on commit 3db17cd

Please sign in to comment.