diff --git a/elao.app.docker/.manala/docker/Dockerfile.tmpl b/elao.app.docker/.manala/docker/Dockerfile.tmpl index afbe95a8..e327a73b 100644 --- a/elao.app.docker/.manala/docker/Dockerfile.tmpl +++ b/elao.app.docker/.manala/docker/Dockerfile.tmpl @@ -34,12 +34,12 @@ RUN \ apt-get --quiet update \ && apt-get --quiet --yes --purge --autoremove upgrade \ && apt-get --quiet --yes --no-install-recommends --verbose-versions install \ - gnupg \ ca-certificates \ - sudo \ curl \ + gnupg \ make \ socat \ + sudo \ {{- if eq (.version|int) 10 }} # Openssl packages are broken on buster/arm64, install them from bullseye # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989604 diff --git a/lazy.ansible/.manala/docker/Dockerfile.tmpl b/lazy.ansible/.manala/docker/Dockerfile.tmpl index dc678491..0cfd6a8e 100644 --- a/lazy.ansible/.manala/docker/Dockerfile.tmpl +++ b/lazy.ansible/.manala/docker/Dockerfile.tmpl @@ -29,19 +29,20 @@ RUN \ apt-get --quiet update \ && apt-get --quiet --yes --purge --autoremove upgrade \ && apt-get --quiet --yes --no-install-recommends --verbose-versions install \ - s6 \ - sudo \ - curl \ - ca-certificates \ - gnupg \ - libarchive-tools bzip2 \ bash-completion \ - rsync \ + bzip2 \ + ca-certificates \ + curl \ git \ - make \ + gnupg \ less \ - vim \ + libarchive-tools \ + make \ + rsync \ + s6 \ socat \ + sudo \ + vim \ # User && addgroup --gid ${MANALA_GROUP_ID} lazy \ && adduser --home /home/lazy --shell /bin/bash --uid ${MANALA_USER_ID} --gecos lazy --ingroup lazy --disabled-password lazy \ @@ -87,11 +88,11 @@ RUN \ apt-get --quiet update \ && apt-get --quiet --yes --no-install-recommends --verbose-versions install \ openssh-client \ - sshpass \ - python3 \ pipx \ + python3 \ python3-argcomplete \ shellcheck \ + sshpass \ {{- range $package := $apt.packages }} {{ $package }} \ {{- end }} diff --git a/lazy.kubernetes/.manala/docker/Dockerfile.tmpl b/lazy.kubernetes/.manala/docker/Dockerfile.tmpl index 24fbcf67..b0226cbb 100644 --- a/lazy.kubernetes/.manala/docker/Dockerfile.tmpl +++ b/lazy.kubernetes/.manala/docker/Dockerfile.tmpl @@ -29,19 +29,20 @@ RUN \ apt-get --quiet update \ && apt-get --quiet --yes --purge --autoremove upgrade \ && apt-get --quiet --yes --no-install-recommends --verbose-versions install \ - s6 \ - sudo \ - curl \ - ca-certificates \ - gnupg \ - libarchive-tools bzip2 \ bash-completion \ - rsync \ + bzip2 \ + ca-certificates \ + curl \ git \ - make \ + gnupg \ less \ - vim \ + libarchive-tools \ + make \ + rsync \ + s6 \ socat \ + sudo \ + vim \ # User && addgroup --gid ${MANALA_GROUP_ID} lazy \ && adduser --home /home/lazy --shell /bin/bash --uid ${MANALA_USER_ID} --gecos lazy --ingroup lazy --disabled-password lazy \ @@ -268,8 +269,9 @@ RUN \ # Openstack RUN \ BUILD_PACKAGES=( \ + gcc \ + libpython3-dev \ pipx \ - libpython3-dev gcc \ ) \ && apt-get --quiet update \ && apt-get --quiet --yes --no-install-recommends --verbose-versions install \ @@ -291,8 +293,9 @@ RUN \ # Swift RUN \ BUILD_PACKAGES=( \ + gcc \ + libpython3-dev \ pipx \ - libpython3-dev gcc \ ) \ && apt-get --quiet update \ && apt-get --quiet --yes --no-install-recommends --verbose-versions install \ diff --git a/lazy.symfony/.manala/docker/Dockerfile.tmpl b/lazy.symfony/.manala/docker/Dockerfile.tmpl index e3868e13..1f0b9a15 100644 --- a/lazy.symfony/.manala/docker/Dockerfile.tmpl +++ b/lazy.symfony/.manala/docker/Dockerfile.tmpl @@ -29,19 +29,20 @@ RUN \ apt-get --quiet update \ && apt-get --quiet --yes --purge --autoremove upgrade \ && apt-get --quiet --yes --no-install-recommends --verbose-versions install \ - s6 \ - sudo \ - curl \ - ca-certificates \ - gnupg \ - libarchive-tools bzip2 \ bash-completion \ - rsync \ + bzip2 \ + ca-certificates \ + curl \ git \ - make \ + gnupg \ less \ - vim \ + libarchive-tools \ + make \ + rsync \ + s6 \ socat \ + sudo \ + vim \ # User && addgroup --gid ${MANALA_GROUP_ID} lazy \ && adduser --home /home/lazy --shell /bin/bash --uid ${MANALA_USER_ID} --gecos lazy --ingroup lazy --disabled-password lazy \ @@ -162,8 +163,8 @@ Signed-By: /etc/apt/keyrings/sury_php.gpg\n\ php{{ $php.version }}-opcache \ php{{ $php.version }}-xdebug \ # Symfony - php{{ $php.version }}-intl \ php{{ $php.version }}-curl \ + php{{ $php.version }}-intl \ php{{ $php.version }}-mbstring \ php{{ $php.version }}-xml \ # Project @@ -225,8 +226,8 @@ Signed-By: /etc/apt/keyrings/yarn.asc\n\ RUN \ apt-get --quiet update \ && apt-get --quiet --yes --no-install-recommends --verbose-versions install \ - openssh-client \ ansible \ + openssh-client \ && ansible-galaxy install --roles-path /usr/share/ansible/roles \ ansistrano.deploy,3.14.0 \ ansistrano.rollback,3.1.0 \