diff --git a/docker-images/base/Dockerfile b/docker-images/base/Dockerfile index c3658b9..da78d8d 100644 --- a/docker-images/base/Dockerfile +++ b/docker-images/base/Dockerfile @@ -14,7 +14,7 @@ RUN \ cd /tmp/unison-2.53.3 && \ make -FROM debian:bullseye-slim +FROM unison RUN \ set -x && \ @@ -100,4 +100,4 @@ ENV container docker STOPSIGNAL SIGRTMIN+3 VOLUME [ "/sys/fs/cgroup", "/run", "/run/lock", "/tmp" ] -ENTRYPOINT ["/sbin/init"] \ No newline at end of file +ENTRYPOINT ["/sbin/init"] diff --git a/docker-images/controller-ci/Dockerfile b/docker-images/controller-ci/Dockerfile index be3fa2d..7c81a26 100644 --- a/docker-images/controller-ci/Dockerfile +++ b/docker-images/controller-ci/Dockerfile @@ -45,7 +45,7 @@ RUN \ chmod 600 /home/controller/.ssh/id_rsa && \ chmod 644 /home/controller/.ssh/id_rsa.pub -RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision" +RUN su - ce-dev -c "git clone --branch 1.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision" COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml diff --git a/docker-images/controller-ci/provision.yml b/docker-images/controller-ci/provision.yml index 59d7f5a..454c9a3 100644 --- a/docker-images/controller-ci/provision.yml +++ b/docker-images/controller-ci/provision.yml @@ -13,7 +13,7 @@ venv_path: "/home/{{ _ce_provision.username }}/ansible" venv_command: /usr/bin/python3 -m venv own_repository: https://github.com/codeenigma/ce-provision.git - own_repository_branch: 2.x + own_repository_branch: 1.x own_repository_skip_checkout: false config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git config_repository_branch: 1.x @@ -38,4 +38,4 @@ linters: enabled: true roles: - - debian/ce_provision + - ce_provision diff --git a/docker-images/controller-devel/Dockerfile b/docker-images/controller-devel/Dockerfile index 469e5c2..2bac8f2 100644 --- a/docker-images/controller-devel/Dockerfile +++ b/docker-images/controller-devel/Dockerfile @@ -17,7 +17,7 @@ RUN \ /tmp/* -RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision" +RUN su - ce-dev -c "git clone --branch 1.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision" COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml diff --git a/docker-images/controller-devel/provision.yml b/docker-images/controller-devel/provision.yml index e109caa..149f9b1 100644 --- a/docker-images/controller-devel/provision.yml +++ b/docker-images/controller-devel/provision.yml @@ -33,7 +33,7 @@ install_username: "{{ _ce_provision.username }}" upgrade_timer_name: upgrade_ce_provision_ansible own_repository: https://github.com/codeenigma/ce-provision.git - own_repository_branch: 2.x + own_repository_branch: 1.x own_repository_skip_checkout: false config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git config_repository_branch: 1.x @@ -60,5 +60,5 @@ linters: enabled: true roles: - - debian/ce_provision - - debian/ce_deploy + - ce_provision + - ce_deploy diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml index cdc0c30..43d367d 100644 --- a/docker-images/controller/provision.yml +++ b/docker-images/controller/provision.yml @@ -56,5 +56,5 @@ linters: enabled: true roles: - - debian/ce_provision - - debian/ce_deploy + - ce_provision + - ce_deploy diff --git a/docker-images/dind/Dockerfile b/docker-images/dind/Dockerfile index cf27486..5675565 100644 --- a/docker-images/dind/Dockerfile +++ b/docker-images/dind/Dockerfile @@ -9,7 +9,7 @@ RUN \ RUN \ set -x && \ export DEBIAN_FRONTEND=noninteractive && \ - echo 'deb [arch=amd64] https://download.docker.com/linux/debian bullseye stable' > /etc/apt/sources.list.d/docker.list && \ + echo 'deb [arch=amd64] https://download.docker.com/linux/debian bookworm stable' > /etc/apt/sources.list.d/docker.list && \ curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \ apt-get update && \ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew" && \ diff --git a/templates/blank/ce-dev/ansible/provision.yml.j2 b/templates/blank/ce-dev/ansible/provision.yml.j2 index 1b9e962..8a30356 100644 --- a/templates/blank/ce-dev/ansible/provision.yml.j2 +++ b/templates/blank/ce-dev/ansible/provision.yml.j2 @@ -20,6 +20,6 @@ - ansible.builtin.import_role: name: _meta/common_base - ansible.builtin.import_role: - name: debian/lhci + name: lhci - ansible.builtin.import_role: - name: debian/frontail + name: frontail diff --git a/templates/drupal10/ce-dev/ansible/provision.yml.j2 b/templates/drupal10/ce-dev/ansible/provision.yml.j2 index 25dd455..44a7fc1 100644 --- a/templates/drupal10/ce-dev/ansible/provision.yml.j2 +++ b/templates/drupal10/ce-dev/ansible/provision.yml.j2 @@ -56,19 +56,19 @@ enable: false {% endraw %} tasks: - - apt: + - ansible.builtin.apt: update_cache: true - - import_role: + - ansible.builtin.import_role: name: _meta/common_base - - import_role: + - ansible.builtin.import_role: name: mysql_client - - import_role: + - ansible.builtin.import_role: name: php-cli - - import_role: + - ansible.builtin.import_role: name: php-fpm - - import_role: + - ansible.builtin.import_role: name: nginx - - import_role: + - ansible.builtin.import_role: name: lhci - - import_role: + - ansible.builtin.import_role: name: frontail diff --git a/templates/drupal8/ce-dev/ansible/provision.yml.j2 b/templates/drupal8/ce-dev/ansible/provision.yml.j2 index 2d152bd..546c801 100644 --- a/templates/drupal8/ce-dev/ansible/provision.yml.j2 +++ b/templates/drupal8/ce-dev/ansible/provision.yml.j2 @@ -62,14 +62,14 @@ - ansible.builtin.import_role: name: _meta/common_base - ansible.builtin.import_role: - name: debian/mysql_client + name: mysql_client - ansible.builtin.import_role: - name: debian/php-cli + name: php-cli - ansible.builtin.import_role: - name: debian/php-fpm + name: php-fpm - ansible.builtin.import_role: - name: debian/nginx + name: nginx - ansible.builtin.import_role: - name: debian/lhci + name: lhci - ansible.builtin.import_role: - name: debian/frontail + name: frontail diff --git a/templates/drupal9/ce-dev/ansible/provision.yml.j2 b/templates/drupal9/ce-dev/ansible/provision.yml.j2 index 2e99b23..635d39a 100644 --- a/templates/drupal9/ce-dev/ansible/provision.yml.j2 +++ b/templates/drupal9/ce-dev/ansible/provision.yml.j2 @@ -56,19 +56,19 @@ enable: false {% endraw %} tasks: - - apt: + - ansible.builtin.apt: update_cache: true - - import_role: + - ansible.builtin.import_role: name: _meta/common_base - - import_role: + - ansible.builtin.import_role: name: mysql_client - - import_role: + - ansible.builtin.import_role: name: php-cli - - import_role: + - ansible.builtin.import_role: name: php-fpm - - import_role: + - ansible.builtin.import_role: name: nginx - - import_role: + - ansible.builtin.import_role: name: lhci - - import_role: + - ansible.builtin.import_role: name: frontail diff --git a/templates/localgov/ce-dev/ansible/provision.yml.j2 b/templates/localgov/ce-dev/ansible/provision.yml.j2 index f171a78..535f624 100644 --- a/templates/localgov/ce-dev/ansible/provision.yml.j2 +++ b/templates/localgov/ce-dev/ansible/provision.yml.j2 @@ -50,19 +50,19 @@ enable: false {% endraw %} tasks: - - apt: + - ansible.builtin.apt: update_cache: true - - import_role: + - ansible.builtin.import_role: name: _meta/common_base - - import_role: + - ansible.builtin.import_role: name: mysql_client - - import_role: + - ansible.builtin.import_role: name: php-cli - - import_role: + - ansible.builtin.import_role: name: php-fpm - - import_role: + - ansible.builtin.import_role: name: nginx - - import_role: + - ansible.builtin.import_role: name: lhci - - import_role: + - ansible.builtin.import_role: name: frontail