Skip to content

Commit

Permalink
[Lazy] Small cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
nervo committed Dec 15, 2023
1 parent bb5f6ce commit b7fc65c
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 18 deletions.
5 changes: 3 additions & 2 deletions lazy.ansible/.manala/docker/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion lazy.ansible/test/.manala.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ manala:
recipe: lazy.ansible

project:
name: lazy-ansible-test
name: lazy-ansible.test

system:
env:
Expand Down
14 changes: 9 additions & 5 deletions lazy.kubernetes/.manala/docker/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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\
Expand Down Expand Up @@ -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

Expand All @@ -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 }} \
Expand All @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion lazy.kubernetes/test/.manala.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ manala:
recipe: lazy.kubernetes

project:
name: lazy-kubernetes-test
name: lazy-kubernetes.test

system:
env:
Expand Down
23 changes: 15 additions & 8 deletions lazy.symfony/.manala/docker/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN \
# System #
##########

{{ $apt := index .Vars.system "apt" -}}
{{ $apt := .Vars.system.apt -}}

RUN \
apt-get --quiet update \
Expand All @@ -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\
Expand Down Expand Up @@ -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 \
Expand All @@ -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\
Expand Down Expand Up @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion lazy.symfony/test/.manala.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ manala:
recipe: lazy.symfony

project:
name: lazy-symfony-test
name: lazy-symfony.test

system:
env:
Expand Down

0 comments on commit b7fc65c

Please sign in to comment.