From b7fc65c45cc5df0305645d49398b2edc601e20b2 Mon Sep 17 00:00:00 2001 From: Florian Rey Date: Fri, 15 Dec 2023 09:55:57 +0100 Subject: [PATCH] [Lazy] Small cleanups --- lazy.ansible/.manala/docker/Dockerfile.tmpl | 5 ++-- lazy.ansible/test/.manala.yaml | 2 +- .../.manala/docker/Dockerfile.tmpl | 14 +++++++---- lazy.kubernetes/test/.manala.yaml | 2 +- lazy.symfony/.manala/docker/Dockerfile.tmpl | 23 ++++++++++++------- lazy.symfony/test/.manala.yaml | 2 +- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/lazy.ansible/.manala/docker/Dockerfile.tmpl b/lazy.ansible/.manala/docker/Dockerfile.tmpl index da8af937..d7fc40bf 100644 --- a/lazy.ansible/.manala/docker/Dockerfile.tmpl +++ b/lazy.ansible/.manala/docker/Dockerfile.tmpl @@ -68,7 +68,7 @@ RUN \ ENV PIPX_HOME="/usr/local" ENV PIPX_BIN_DIR="/usr/local/bin" -{{ $apt := index .Vars.system "apt" -}} +{{ $apt := .Vars.system.apt -}} RUN \ apt-get --quiet update \ @@ -94,7 +94,8 @@ RUN \ RUN \ curl -sSL https://download.docker.com/linux/debian/gpg \ --output /etc/apt/keyrings/docker.asc \ - && printf "Types: deb\n\ + && printf "\ +Types: deb\n\ URIs: https://download.docker.com/linux/debian\n\ Suites: {{ include "os_release" "VERSION_CODENAME" }}\n\ Components: stable\n\ diff --git a/lazy.ansible/test/.manala.yaml b/lazy.ansible/test/.manala.yaml index d2673786..13f13840 100644 --- a/lazy.ansible/test/.manala.yaml +++ b/lazy.ansible/test/.manala.yaml @@ -3,7 +3,7 @@ manala: recipe: lazy.ansible project: - name: lazy-ansible-test + name: lazy-ansible.test system: env: diff --git a/lazy.kubernetes/.manala/docker/Dockerfile.tmpl b/lazy.kubernetes/.manala/docker/Dockerfile.tmpl index 8e702dc0..97218a8d 100644 --- a/lazy.kubernetes/.manala/docker/Dockerfile.tmpl +++ b/lazy.kubernetes/.manala/docker/Dockerfile.tmpl @@ -70,7 +70,7 @@ ARG PIPX_BIN_DIR="/usr/local/bin" ARG VIM_GNUPG_VERSION="2.7.1" -{{ $apt := index .Vars.system "apt" -}} +{{ $apt := .Vars.system.apt -}} RUN \ apt-get --quiet update \ @@ -93,7 +93,8 @@ RUN \ RUN \ curl -sSL https://download.docker.com/linux/debian/gpg \ --output /etc/apt/keyrings/docker.asc \ - && printf "Types: deb\n\ + && printf "\ +Types: deb\n\ URIs: https://download.docker.com/linux/debian\n\ Suites: {{ include "os_release" "VERSION_CODENAME" }}\n\ Components: stable\n\ @@ -126,7 +127,8 @@ RUN \ # Bash completion && kubectl completion bash > /etc/bash_completion.d/kubectl \ # Bash aliases - && printf "alias k='kubectl'\n\ + && printf "\ +alias k='kubectl'\n\ complete -F __start_kubectl k\n\ " > /etc/profile.d/kubectl.sh @@ -140,7 +142,8 @@ RUN \ # Bash completion && helm completion bash > /etc/bash_completion.d/helm \ # Bash aliases - && printf "alias h='helm'\n\ + && printf "\ +alias h='helm'\n\ complete -F __start_helm h\n\ " > /etc/profile.d/helm.sh {{- if $helm.plugins }} \ @@ -166,7 +169,8 @@ RUN \ # Bash completion && helmfile completion bash > /etc/bash_completion.d/helmfile \ # Bash aliases - && printf "alias hf='helmfile'\n\ + && printf "\ +alias hf='helmfile'\n\ complete -F __start_helmfile hf\n\ alias hfi='helmfile --interactive'\n\ complete -F __start_helmfile hfi\n\ diff --git a/lazy.kubernetes/test/.manala.yaml b/lazy.kubernetes/test/.manala.yaml index 0173893f..1f4ecf7c 100644 --- a/lazy.kubernetes/test/.manala.yaml +++ b/lazy.kubernetes/test/.manala.yaml @@ -3,7 +3,7 @@ manala: recipe: lazy.kubernetes project: - name: lazy-kubernetes-test + name: lazy-kubernetes.test system: env: diff --git a/lazy.symfony/.manala/docker/Dockerfile.tmpl b/lazy.symfony/.manala/docker/Dockerfile.tmpl index e90125bf..dd6a2a4e 100644 --- a/lazy.symfony/.manala/docker/Dockerfile.tmpl +++ b/lazy.symfony/.manala/docker/Dockerfile.tmpl @@ -65,7 +65,7 @@ RUN \ # System # ########## -{{ $apt := index .Vars.system "apt" -}} +{{ $apt := .Vars.system.apt -}} RUN \ apt-get --quiet update \ @@ -82,7 +82,8 @@ RUN \ RUN \ curl -sSL https://download.docker.com/linux/debian/gpg \ --output /etc/apt/keyrings/docker.asc \ - && printf "Types: deb\n\ + && printf "\ +Types: deb\n\ URIs: https://download.docker.com/linux/debian\n\ Suites: {{ include "os_release" "VERSION_CODENAME" }}\n\ Components: stable\n\ @@ -111,13 +112,15 @@ RUN \ RUN \ curl -sSL http://nginx.org/keys/nginx_signing.key \ --output /etc/apt/keyrings/nginx.asc \ - && printf "Types: deb\n\ + && printf "\ +Types: deb\n\ URIs: http://nginx.org/packages/debian\n\ Suites: {{ include "os_release" "VERSION_CODENAME" }}\n\ Components: nginx\n\ Signed-By: /etc/apt/keyrings/nginx.asc\n\ " > /etc/apt/sources.list.d/nginx.sources \ - && printf "Package: nginx\n\ + && printf "\ +Package: nginx\n\ Pin: version {{ $nginx.version }}.*\n\ Pin-Priority: 1000\n\ " > /etc/apt/preferences.d/nginx \ @@ -132,7 +135,8 @@ Pin-Priority: 1000\n\ RUN \ curl -sSL https://packages.sury.org/php/apt.gpg \ --output /etc/apt/keyrings/sury_php.gpg \ - && printf "Types: deb\n\ + && printf "\ +Types: deb\n\ URIs: https://packages.sury.org/php/\n\ Suites: {{ include "os_release" "VERSION_CODENAME" }}\n\ Components: main\n\ @@ -173,19 +177,22 @@ Signed-By: /etc/apt/keyrings/sury_php.gpg\n\ RUN \ curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key \ --output /etc/apt/keyrings/nodesource.asc \ - && printf "Types: deb\n\ + && printf "\ +Types: deb\n\ URIs: https://deb.nodesource.com/node_{{ $nodejs.version }}.x\n\ Suites: {{ include "os_release" "VERSION_CODENAME" }}\n\ Components: main\n\ Signed-By: /etc/apt/keyrings/nodesource.asc\n\ " > /etc/apt/sources.list.d/nodesource.sources \ - && printf "Package: nodejs\n\ + && printf "\ +Package: nodejs\n\ Pin: origin deb.nodesource.com\n\ Pin-Priority: 1000\n\ " > /etc/apt/preferences.d/nodejs \ && curl -sSL https://dl.yarnpkg.com/debian/pubkey.gpg \ --output /etc/apt/keyrings/yarn.asc \ - && printf "Types: deb\n\ + && printf "\ +Types: deb\n\ URIs: https://dl.yarnpkg.com/debian/\n\ Suites: stable\n\ Components: main\n\ diff --git a/lazy.symfony/test/.manala.yaml b/lazy.symfony/test/.manala.yaml index 0526a402..e6303e8b 100644 --- a/lazy.symfony/test/.manala.yaml +++ b/lazy.symfony/test/.manala.yaml @@ -3,7 +3,7 @@ manala: recipe: lazy.symfony project: - name: lazy-symfony-test + name: lazy-symfony.test system: env: