Skip to content

Allow services overrides and enforce harbor_data_dev check #1

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow services overrides and enforce harbor_data_dev check #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
filesystem:
fstype: "{{ harbor_data_fstype }}"
dev: "{{ harbor_data_dev }}"
when: harbor_data_dev != ""
when: harbor_data_dev is defined and harbor_data_dev != ""
become: yes

- name: Mount disk for data dir
Expand All @@ -36,7 +36,7 @@
src: "{{ harbor_data_dev }}"
fstype: "{{ harbor_data_fstype }}"
state: mounted
when: harbor_data_dev != ""
when: harbor_data_dev is defined and harbor_data_dev != ""
become: yes

- name: "Downloading Harbor {{ harbor_version }} (offline installer)"
Expand Down Expand Up @@ -73,13 +73,21 @@
become: yes
register: config

- name: "Add service Overrides"
template:
src: docker-compose.override.yml.j2
dest: "{{ harbor_install_dir }}/harbor/docker-compose.override.yml"
become: yes
when: harbor_services_overrides is defined and harbor_services_overrides != ''
register: overrides

- name: Running Harbor installer...
command: "./install.sh {{ harbor_installer_with }} {{ harbor_installer_extra_args }}"
args:
chdir: "{{ harbor_install_dir }}/harbor"
creates: '{{ harbor_install_dir }}/harbor/harbor_install_log.txt'
become: yes
when: config is changed
when: config is changed or overrides is changed

- name: Creating projects
uri:
Expand Down
3 changes: 3 additions & 0 deletions templates/docker-compose.override.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version: '2.3'
services:
{{ harbor_services_overrides | to_nice_yaml(indent=2) | indent(2) }}