Skip to content

Commit

Permalink
fixup! ⬆️(dependencies) update python dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jmaupetit committed Oct 4, 2021
1 parent 3da45fb commit 66dff78
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
7 changes: 0 additions & 7 deletions Dockerfile
Expand Up @@ -72,13 +72,6 @@ RUN apt-get update && \
COPY requirements/development.txt /app/requirements.txt
RUN pip install --no-cache-dir -r /app/requirements.txt

# Install more ansible_lint_rules
ENV ANSIBLE_LINT_RULES_DIR="/usr/local/share/ansible-lint/rules"
RUN mkdir -p "${ANSIBLE_LINT_RULES_DIR}" && \
curl -sLo /tmp/ansible-lint-rules.zip https://github.com/lean-delivery/ansible-lint-rules/archive/1.2.0.zip && \
unzip -j /tmp/ansible-lint-rules.zip '*/rules/*' -d "${ANSIBLE_LINT_RULES_DIR}" && \
rm -rf "/tmp/ansible-lint-rules.zip"

# pylint history and cache files
ENV PYLINTHOME="/app/.pylint.d"

Expand Down
5 changes: 2 additions & 3 deletions Makefile
Expand Up @@ -29,8 +29,7 @@ K8S_DOMAIN ?= "$(shell hostname -I | awk '{print $$1}')"
K3D_CLUSTER_NAME ?= arnold

# -- Linters
ANSIBLE_LINT_RULES_DIR = /usr/local/share/ansible-lint/rules
ANSIBLE_LINT_SKIP_RULES = E602
ANSIBLE_LINT_SKIP_RULES =

# ==============================================================================
# RULES
Expand Down Expand Up @@ -65,7 +64,7 @@ lint-ansible: ## lint ansible sources
@echo 'Checking syntax…'
$(ARNOLD_RUN_DEV) ansible-playbook --syntax-check ./*.yml
@echo 'Linting sources…'
$(ARNOLD_RUN_DEV) ansible-lint -R -r $(ANSIBLE_LINT_RULES_DIR) -x $(ANSIBLE_LINT_SKIP_RULES) ./*.yml
$(ARNOLD_RUN_DEV) ansible-lint -R -x $(ANSIBLE_LINT_SKIP_RULES) ./*.yml
.PHONY: lint-ansible

lint-bash: ## lint bash scripts with shellcheck
Expand Down
8 changes: 5 additions & 3 deletions tasks/create_docker_registry_secrets.yml
Expand Up @@ -6,11 +6,13 @@
path: "group_vars/customer/{{ customer }}/{{ env_type }}/secrets/registries.vault.yml"
register: registries_vault

- block:
- name: Check if registries vault exists
- name: Check if registries vault exists
block:
- name: End play debug error message
debug:
msg: "No registries vault is associated with the namespace"
- meta: end_play
- name: Exit playbook
meta: end_play
when: not registries_vault.stat.exists

- name: Import registries variable
Expand Down
2 changes: 1 addition & 1 deletion tasks/load_app_defaults.yml
Expand Up @@ -11,7 +11,7 @@

- name: Define missing variables with defaults
set_fact:
"{{ app_var.key }}": "{{ lookup('vars', app_var.key, default=app_var.value) }}"
"{{ app_var.key }}": "{{ lookup('vars', app_var.key, default=app_var.value) }}" # noqa var-naming
loop: "{{ lookup('dict', defaults) }}"
loop_control:
loop_var: "app_var"

0 comments on commit 66dff78

Please sign in to comment.