Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: drop support for pinning dokku dependencies #137

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,6 @@ Supported Platforms
ssh_key: CAMILLAS_PUBLIC_SSH_KEY
```

### dokku_version (deprecated)

- default: `''`
- type: `string`
- description: The version of dokku to install.
Scheduled for deletion after 07/2021. Use `dokku_packages_state` instead.

### dokku_vhost_enable

- default: `true`
Expand All @@ -133,27 +126,6 @@ Scheduled for deletion after 07/2021. Use `dokku_packages_state` instead.
- type: `string`
- description: Use web-based config for hostname and keyfile

### herokuish_version (deprecated)

- default: `''`
- type: `string`
- description: The version of herokuish to install.
Scheduled for deletion after 07/2021. Use `dokku_packages_state` instead.

### plugn_version (deprecated)

- default: `''`
- type: `string`
- description: The version of plugn to install.
Scheduled for deletion after 07/2021. Use `dokku_packages_state` instead.

### sshcommand_version (deprecated)

- default: `''`
- type: `string`
- description: The version of sshcommand to install.
Scheduled for deletion after 07/2021. Use `dokku_packages_state` instead.

## Libraries

### dokku_acl_app
Expand Down
4 changes: 0 additions & 4 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,5 @@ dokku_manage_nginx: true
dokku_packages_state: present
dokku_plugins: {}
dokku_skip_key_file: 'false'
dokku_version: ''
dokku_vhost_enable: 'true'
dokku_web_config: 'false'
herokuish_version: ''
plugn_version: ''
sshcommand_version: ''
36 changes: 0 additions & 36 deletions defaults/main.yml.base
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,6 @@ dokku_packages_state:
description: State of dokku packages. Accepts 'present' and 'latest'
type: string

dokku_version:
default: ""
description: |
The version of dokku to install.
Scheduled for deletion after 07/2021. Use `dokku_packages_state` instead.
deprecated: true
templated: true
type: string

dokku_manage_nginx:
default: true
description: Whether we should manage the 00-default nginx site
Expand All @@ -26,33 +17,6 @@ dokku_daemon_version:
description: The version of dokku-daemon to install
type: string

herokuish_version:
default: ""
description: |
The version of herokuish to install.
Scheduled for deletion after 07/2021. Use `dokku_packages_state` instead.
deprecated: true
templated: true
type: string

sshcommand_version:
default: ""
description: |
The version of sshcommand to install.
Scheduled for deletion after 07/2021. Use `dokku_packages_state` instead.
deprecated: true
templated: true
type: string

plugn_version:
default: ""
description: |
The version of plugn to install.
Scheduled for deletion after 07/2021. Use `dokku_packages_state` instead.
deprecated: true
templated: true
type: string

dokku_users:
default: null
description: |
Expand Down
15 changes: 0 additions & 15 deletions tasks/install-pin.yml

This file was deleted.

27 changes: 0 additions & 27 deletions tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,33 +58,6 @@
tags:
- dokku

# this can be removed in July 2021
# (package pinning deprecated).
- name: package pinning
include_tasks: install-pin.yml
with_dict:
plugn: "{{ plugn_version }}"
sshcommand: "{{ sshcommand_version }}"
herokuish: "{{ herokuish_version }}"
dokku: "{{ dokku_version }}"
tags:
- dokku
- dokku-install

# note: this is necessary since the apt module with "state: present" (below)
# does *not* check whether the package version agrees with the pinned version.
# Cannot be done in the pinning loop since all packages need to be unpinned
# (or you can get version conflicts).
- name: install pinned {{ item.key }} package
apt:
name: "{{ item.key }}={{ item.value }}"
with_dict:
plugn: "{{ plugn_version }}"
sshcommand: "{{ sshcommand_version }}"
herokuish: "{{ herokuish_version }}"
dokku: "{{ dokku_version }}"
when: item.value

- name: install dokku packages
apt:
name:
Expand Down