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.

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

Jump to bottom

refactor(init): remove duplicated jinja #227

Merged
merged 1 commit into from
Jul 22, 2019
Merged

refactor(init): remove duplicated jinja #227

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
6 changes: 1 addition & 5 deletions docker/init.sls
View file
Open in desktop
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 }}