Browse Source

remove sample ansible playbook to avoid duplication of container settings in `docker-compose.yml`

Fabian Peter Hammerle 3 years ago
parent
commit
504401ce75
2 changed files with 3 additions and 51 deletions
  1. 3 7
      CHANGELOG.md
  2. 0 44
      ansible-playbook.yml

+ 3 - 7
CHANGELOG.md

@@ -5,15 +5,11 @@ 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
 - `docker-compose`: drop capabilities
-- sample playbook:
-  - disable unnecessary facts gathering
-  - pin docker image by specifying digest (no longer trust registry)
+
+### Removed
+- sample ansible playbook to avoid duplication of container settings in `docker-compose.yml`
 
 ## [1.0.0] - 2020-01-04
 

+ 0 - 44
ansible-playbook.yml

@@ -1,44 +0,0 @@
-- 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_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]
-    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_container.ansible_facts.docker_container.Name | replace('/', '') }}"
-        TOR_PORT: 9050
-        ONION_SERVICE_HOST: change-me.onion
-        ONION_SERVICE_PORT: 80
-        # TIMEOUT_SECONDS: 8
-        # SLEEP_DURATION: 1m
-        RECIPIENT_ADDRESS: change.me@domain.tld
-      volumes:
-      - onion_service_monitor_mail_queue:/var/spool/dma:rw
-      networks:
-      - name: '{{ tor_proxy_network.ansible_facts.docker_network.Name }}'
-      purge_networks: yes
-      restart_policy: unless-stopped
-      memory: 64M
-      cpu_quota: 2000
-      cpu_period: 10000
-      security_opts: [no-new-privileges]