Skip to content

Allow branch switching pr devel #168

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

Merged
merged 76 commits into from
Jan 29, 2024
Merged

Allow branch switching pr devel #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
5bee26c
Fix docker-compose v2 issue and re-release to include clamav role (#68)
nfawbert Jan 28, 2022
e42ebd1
Killing old ce-dev container when updating (#70)
nfawbert Feb 2, 2022
b0dc9d9
Added Drupal9 and Localgov templates (#73)
DionisioFG Mar 9, 2022
34ce84c
New release 1.1.19 (#75)
DionisioFG Mar 10, 2022
cae50ba
Updated package.json version: 1.1.19 (#77)
DionisioFG Mar 10, 2022
79372e7
New tag to fix repo key for Chrome (#83)
DionisioFG Jul 1, 2022
4fa738c
#CE-62820: Added support for composer '2.x' in Drupal 9 provision tem…
davids4 Sep 8, 2022
70954a3
REL 1.1.21: Using composer 2 with Drupal 9 by default (#92)
DionisioFG Sep 8, 2022
62e753e
Drupal template fixes pr 1.x (#94)
gregharvey Sep 9, 2022
710a4e3
CE-DEV: some updates and tweaks (#96)
DionisioFG Sep 14, 2022
6046092
Release 1.1.23 (#97)
DionisioFG Sep 14, 2022
2dc8b59
Bump minimist from 1.2.5 to 1.2.6 (#79)
dependabot[bot] Sep 15, 2022
dd597b8
Bump ansi-regex from 3.0.0 to 3.0.1 (#84)
dependabot[bot] Sep 15, 2022
4f0e659
Bump moment from 2.27.0 to 2.29.4 (#85)
dependabot[bot] Sep 15, 2022
2dc648c
Changing 'set-current' choice to a valid one.
gregharvey Sep 15, 2022
8434c0d
Fixing ce_provision vars in container builds. (#102)
gregharvey Apr 14, 2023
0581ade
Adding variables pr 1.x (#104)
gregharvey Apr 14, 2023
fdc01d0
Adding variables pr 1.x (#106)
gregharvey Apr 14, 2023
dd3d9fc
Adding variables pr 1.x (#109)
gregharvey Apr 14, 2023
cd1345b
Adding variables pr 1.x (#111)
gregharvey Apr 14, 2023
7c9e1bc
Fix setup on a Mac: use Docker Compose V2 with the new 'cgroup' param…
iKristjan May 17, 2023
2c8d2ff
Bump minimatch from 3.0.4 to 3.1.2 (#107)
dependabot[bot] May 18, 2023
8325116
Merge branch '1.x' of github.com:codeenigma/ce-dev into 1.x
gregharvey May 18, 2023
c884a4f
Cgroup fixes pr 1.x (#115)
gregharvey May 18, 2023
d4b8b37
Merge branch '1.x' of github.com:codeenigma/ce-dev into 1.x
gregharvey May 18, 2023
6578ae9
Adding new required ce-provision rkhunter variable. (#119)
gregharvey May 22, 2023
fd04f9c
Issue 120: docker ps change, can no longer use --format *and* --quiet…
galooph Jul 10, 2023
0d25cfe
REL 1.2.1: Fix --quiet and --format use (#123)
DionisioFG Jul 10, 2023
6ddcb4d
Drupal template fixes pr 1.x (#126)
gregharvey Jul 18, 2023
45cdf89
Bump semver from 5.7.1 to 5.7.2 (#124)
dependabot[bot] Jul 18, 2023
f347208
Updating docs URL for CI to https. (#131)
gregharvey Jul 18, 2023
9e6df79
Drupal template fixes pr 1.x (#133)
gregharvey Jul 18, 2023
2746cd5
Drupal template fixes pr 1.x (#135)
gregharvey Jul 18, 2023
06bf830
Drupal template fixes pr 1.x (#138)
gregharvey Jul 19, 2023
0ae2dc6
Packaging 1.2.2 with new Drupal templates.
gregharvey Jul 19, 2023
57de3cd
Drupal template fixes pr 1.x (#140)
gregharvey Jul 19, 2023
6e51555
Upgrading base container to bullseye-slim. (#141)
gregharvey Jul 20, 2023
c56b900
Adding release info.
gregharvey Jul 20, 2023
845c62f
66912: Added Drupal10 template (#144)
DionisioFG Aug 29, 2023
a45f96f
Bump word-wrap from 1.2.3 to 1.2.4 (#136)
dependabot[bot] Oct 25, 2023
6f89931
Update Troubleshooting.md to include more information around cgroup. …
philipnorton42 Oct 25, 2023
dc14dbd
Bump debug from 4.1.1 to 4.3.4 (#146)
dependabot[bot] Oct 25, 2023
bf4fd05
#60168: Documentation: Updated Troubleshooting information for 'Ubunt…
davids4 Oct 25, 2023
a5ace2c
Bullseye upgrade pr 1.x (#147)
gregharvey Nov 8, 2023
cb72b14
Adding build for testing images from devel. (#149)
gregharvey Nov 8, 2023
81a95c6
Creating devel containers with Debian 'bookworm' (12).
gregharvey Nov 8, 2023
9b0d2fc
Moving ansible and boto3 installs to apt.
gregharvey Nov 8, 2023
e035a89
apt installed ansible is not in /usr/local.
gregharvey Nov 8, 2023
cfa368e
Updating dependencies.
gregharvey Nov 10, 2023
3a48a59
Updating yarn.lock again.
gregharvey Nov 10, 2023
dc3d58d
Fixing ansible paths for ce-provision 2.x.
gregharvey Nov 10, 2023
1a9807e
Adding new variables required by controller.
gregharvey Nov 10, 2023
c30464c
Installing ansible in a virtual environment on the container before r…
gregharvey Nov 10, 2023
d3216b9
Missing a slash!
gregharvey Nov 10, 2023
f54182c
Also missed a &&.
gregharvey Nov 10, 2023
f36f660
Adding python venv support via apt in base image.
gregharvey Nov 10, 2023
4e80238
Temporarily adding python3-venv to the controller Dockerfile.
gregharvey Nov 10, 2023
fd6867d
Installing Ansible as the ce-dev user to avoid perms issues.
gregharvey Nov 10, 2023
4db5392
Upgrading ubuntu in CI to have systemd as default and disabling Ansib…
gregharvey Nov 13, 2023
5561b76
Missing an ansible install var.
gregharvey Nov 13, 2023
154e76e
Documentation for testing containers.
gregharvey Nov 13, 2023
d750a8d
Adding vscode settings to .gitignore.
gregharvey Jan 25, 2024
9a4cff3
Adding devel versions of Dockerfiles and config.
gregharvey Jan 25, 2024
f625a9e
Fixing bug caused by set line.
gregharvey Jan 25, 2024
78846e1
Updating CI for export.sh changes.
gregharvey Jan 26, 2024
654a51f
Adding ability to switch ce-provision own branch and config branch.
gregharvey Jan 26, 2024
beec77c
Merging devel.
gregharvey Jan 29, 2024
56e8764
Merge branch 'allow_branch_switching' into allow_branch_switching-PR-…
gregharvey Jan 29, 2024
f643930
Merge branch 'devel' into allow_branch_switching-PR-devel
gregharvey Jan 29, 2024
d26edb9
Merge branch 'bookworm_upgrade' into allow_branch_switching
gregharvey Jan 29, 2024
35fea76
Restoring the 1.x branch.
gregharvey Jan 29, 2024
8cfceac
Merging devel.
gregharvey Jan 29, 2024
29eee31
Missed a couple of 2.x references.
gregharvey Jan 29, 2024
90c26b3
Merge branch 'allow_branch_switching' into allow_branch_switching-PR-…
gregharvey Jan 29, 2024
3a57646
Updating yarn.lock again.
gregharvey Jan 29, 2024
637a8f9
Merge branch 'allow_branch_switching' into allow_branch_switching-PR-…
gregharvey Jan 29, 2024
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
4 changes: 2 additions & 2 deletions docker-images/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN \
cd /tmp/unison-2.53.3 && \
make

FROM debian:bullseye-slim
FROM unison

RUN \
set -x && \
Expand Down Expand Up @@ -100,4 +100,4 @@ ENV container docker
STOPSIGNAL SIGRTMIN+3
VOLUME [ "/sys/fs/cgroup", "/run", "/run/lock", "/tmp" ]

ENTRYPOINT ["/sbin/init"]
ENTRYPOINT ["/sbin/init"]
2 changes: 1 addition & 1 deletion docker-images/controller-ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions docker-images/controller-ci/provision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -38,4 +38,4 @@
linters:
enabled: true
roles:
- debian/ce_provision
- ce_provision
2 changes: 1 addition & 1 deletion docker-images/controller-devel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions docker-images/controller-devel/provision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -60,5 +60,5 @@
linters:
enabled: true
roles:
- debian/ce_provision
- debian/ce_deploy
- ce_provision
- ce_deploy
4 changes: 2 additions & 2 deletions docker-images/controller/provision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@
linters:
enabled: true
roles:
- debian/ce_provision
- debian/ce_deploy
- ce_provision
- ce_deploy
2 changes: 1 addition & 1 deletion docker-images/dind/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" && \
Expand Down
4 changes: 2 additions & 2 deletions templates/blank/ce-dev/ansible/provision.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 8 additions & 8 deletions templates/drupal10/ce-dev/ansible/provision.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions templates/drupal8/ce-dev/ansible/provision.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 8 additions & 8 deletions templates/drupal9/ce-dev/ansible/provision.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 8 additions & 8 deletions templates/localgov/ce-dev/ansible/provision.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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