Skip to content

Commit

Permalink
Merge pull request #227 from noelmcloughlin/dups
Browse files Browse the repository at this point in the history
refactor(init): remove duplicated jinja
  • Loading branch information
noelmcloughlin authored Jul 22, 2019
2 parents 947b062 + 00353cf commit c9b24e1
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions docker/init.sls
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import docker with context %}
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import docker with context %}
{%- set sls_package_install = tplroot ~ '.install' %}
{%- set sls_macapp_install = tplroot ~ '.macosapp' %}
include:
- {{ sls_package_install if not docker.pkg.use_upstream_app else sls_macapp_install }}
- {{ sls_package_install if not docker.pkg.use_upstream_app else sls_macapp_install }}

0 comments on commit c9b24e1

Please sign in to comment.