5 Commits 34183bf283 ... 256526db99

Author SHA1 Message Date
  Fabian Peter Hammerle 256526db99 refactor playbook: avoid duplication of container name 4 years ago
  Fabian Peter Hammerle 493a5e5d5b refactor playbook: drop redundant invocation of `docker_volume` module 4 years ago
  Fabian Peter Hammerle 6f44f48fb2 playbook: set bridge name 4 years ago
  Fabian Peter Hammerle acb0f1be5f refactor playbook: avoid duplication of network name 4 years ago
  Fabian Peter Hammerle 3cac09de70 playbook: disable unnecessary facts gathering 4 years ago
2 changed files with 16 additions and 5 deletions
  1. 8 0
      CHANGELOG.md
  2. 8 5
      ansible-playbook.yml

+ 8 - 0
CHANGELOG.md

@@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- sample playbook:
+  - set name of bridge interface to "tor-proxy" (instead of using random name)
+
+### Fixed
+- sample playbook:
+  - disable unnecessary facts gathering
+  - pin docker image by specifying digest (no longer trust registry)
 
 ## [1.0.0] - 2020-01-04
 

+ 8 - 5
ansible-playbook.yml

@@ -1,28 +1,31 @@
 - hosts: [some-host]
   become: true
+  gather_facts: no
   tasks:
   - docker_network:
       name: tor
+      driver_options:
+        com.docker.network.bridge.name: tor-proxy
+    register: tor_proxy_network
   - docker_container:
       name: tor_proxy
       # 1.0.0-tor0.4.1.6-amd64
       image: fphammerle/tor-proxy@sha256:ad55d07b1b21c35fa044dc3e1ea6c7d8494f39eb89491ddad35c245340f7cd4b
       networks:
-      - name: tor
+      - name: '{{ tor_proxy_network.ansible_facts.docker_network.Name }}'
       purge_networks: yes
       restart_policy: unless-stopped
       memory: 128M
       cpu_quota: 5000
       cpu_period: 10000
       security_opts: [no-new-privileges]
-  - docker_volume:
-      name: onion_service_monitor_mail_queue
+    register: tor_proxy_container
   - docker_container:
       name: onion_service_monitor
       # docker/1.0.0-amd64
       image: docker.io/fphammerle/onion-service-status-mail@sha256:98585eb7a6d9724240982560a8e7262a5c4019aa875de590bf608917d841377c
       env:
-        TOR_HOST: tor_proxy
+        TOR_HOST: "{{ tor_proxy_container.ansible_facts.docker_container.Name | replace('/', '') }}"
         TOR_PORT: 9050
         ONION_SERVICE_HOST: change-me.onion
         ONION_SERVICE_PORT: 80
@@ -32,7 +35,7 @@
       volumes:
       - onion_service_monitor_mail_queue:/var/spool/dma:rw
       networks:
-      - name: tor
+      - name: '{{ tor_proxy_network.ansible_facts.docker_network.Name }}'
       purge_networks: yes
       restart_policy: unless-stopped
       memory: 64M