Skip to content

Commit 4fba8cf

Browse files
gregharveynfawbertDionisioFGdavids4David Suissa
authored
Bullseye upgrade pr devel (#127)
* Fix docker-compose v2 issue and re-release to include clamav role (#68) * Killing old ce-dev container when updating (#70) * Added Drupal9 and Localgov templates (#73) * New release 1.1.19 (#75) * Updated package.json version: 1.1.19 (#77) * Updated package.json version: 1.1.19 * New tag to fix repo key for Chrome (#83) * #CE-62820: Added support for composer '2.x' in Drupal 9 provision tem… (#89) (#91) * #CE-62820: Added support for composer '2.x' in Drupal 9 provision template. * #CE-62820: Attempt to fix pull request test cases by providing a default value for the 'new_user' in provision. * #CE-62820: Attempt to fix pull request test cases by providing a default value for the 'key_name' in provision. * #CE-62820: Attempt to fix pull request test cases by providing a default values for 'ce_deploy' in provision. Co-authored-by: David Suissa <david.suissa@codeenigma.com> Co-authored-by: David Suissa <david.suissa@codeenigma.com> * REL 1.1.21: Using composer 2 with Drupal 9 by default (#92) * Drupal template fixes pr 1.x (#94) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * CE-DEV: some updates and tweaks (#96) * Renamed the settings and drush files for ce-dev * Added nodejs 16.x as default version * Added lhci_run role by default * Some tweaks in the config * Added the if statement to read info from an optional settings.local.php file * Release 1.1.23 (#97) * Bump minimist from 1.2.5 to 1.2.6 (#79) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ansi-regex from 3.0.0 to 3.0.1 (#84) Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/chalk/ansi-regex/releases) - [Commits](chalk/ansi-regex@v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: ansi-regex dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump moment from 2.27.0 to 2.29.4 (#85) Bumps [moment](https://github.com/moment/moment) from 2.27.0 to 2.29.4. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](moment/moment@2.27.0...2.29.4) --- updated-dependencies: - dependency-name: moment dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Changing 'set-current' choice to a valid one. * Fixing ce_provision vars in container builds. (#102) * Adding variables pr 1.x (#104) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding variables pr 1.x (#106) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding the option to build manually the containers. * Adding variables pr 1.x (#109) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding the option to build manually the containers. * Still missing some vars. * Adding variables pr 1.x (#111) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding the option to build manually the containers. * Still missing some vars. * Setting older version of Ubuntu for containers. * Fix setup on a Mac: use Docker Compose V2 with the new 'cgroup' parameter. * Bump minimatch from 3.0.4 to 3.1.2 (#107) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Cgroup fixes pr 1.x (#115) * Fix setup on a Mac: use Docker Compose V2 with the new 'cgroup' parameter. * Fix setup on a Mac: use Docker Compose V2 with the new 'cgroup' parameter. (#113) * Documentation update for docker composer v2. * Temporarily disabling LHCI for Drupal 9 due to an HTML issue. * Preparing release of 1.2.0. * Updating release version in package.json. * Updating yarn dependencies. * Committing package-lock.json (new file with newer node versions). * Revert "Committing package-lock.json (new file with newer node versions)." This reverts commit 8912d3d. * Revert "Updating yarn dependencies." This reverts commit 94be4ab. --------- Co-authored-by: Kristjan Lilleoja <kristjan.lilleoja@yumuuv.com> Co-authored-by: Kristjan Lilleoja <kristjanlilleoja@me.com> * Adding new required ce-provision rkhunter variable. (#119) * Issue 120: docker ps change, can no longer use --format *and* --quiet. (#122) * REL 1.2.1: Fix --quiet and --format use (#123) * Drupal template fixes pr 1.x (#126) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * Updating Drupal templates. * Removing docs steps for ansible because they cannot work. * Suppressing unattended-upgrades. * Adding composer plugins to Drupal 8 deployments. * Adding the phpcodesniffer plugin for D8. * Upgrading base container to bullseye-slim. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: nfawbert <62660788+nfawbert@users.noreply.github.com> Co-authored-by: Dionisio <dionisiofernandez83@gmail.com> Co-authored-by: davids4 <35807961+davids4@users.noreply.github.com> Co-authored-by: David Suissa <david.suissa@codeenigma.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kristjan Lilleoja <kristjan.lilleoja@yumuuv.com> Co-authored-by: Kristjan Lilleoja <kristjanlilleoja@me.com> Co-authored-by: Dan Smith <dan.smith@codeenigma.com>
1 parent 2185866 commit 4fba8cf

File tree

1 file changed

+8
-21
lines changed

1 file changed

+8
-21
lines changed

‎docker-images/base/Dockerfile‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:buster as unison
1+
FROM debian:bullseye-slim as unison
22
RUN \
33
set -x && \
44
export DEBIAN_FRONTEND=noninteractive && \
@@ -9,12 +9,12 @@ RUN \
99
wget \
1010
ocaml-native-compilers && \
1111
cd /tmp/ && \
12-
wget https://github.com/bcpierce00/unison/archive/v2.51.2.tar.gz && \
13-
tar -xzvf v2.51.2.tar.gz && \
14-
cd /tmp/unison-2.51.2 && \
12+
wget https://github.com/bcpierce00/unison/archive/v2.53.3.tar.gz && \
13+
tar -xzvf v2.53.3.tar.gz && \
14+
cd /tmp/unison-2.53.3 && \
1515
make
1616

17-
FROM debian:buster
17+
FROM debian:bullseye-slim
1818

1919
RUN \
2020
set -x && \
@@ -54,19 +54,6 @@ RUN \
5454
/var/log/* \
5555
/tmp/*
5656

57-
# Temp workaround bug in system.d with kernel 5.8
58-
RUN \
59-
echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list && \
60-
set -x && \
61-
export DEBIAN_FRONTEND=noninteractive && \
62-
apt-get update && \
63-
apt-get -y -o Dpkg::Options::="--force-confnew" -t=buster-backports upgrade systemd && \
64-
apt-get clean && \
65-
rm -rf \
66-
/var/lib/apt/lists/* \
67-
/var/log/* \
68-
/tmp/*
69-
7057
RUN \
7158
echo 'UseDNS no' >> /etc/ssh/sshd_config && \
7259
mkdir -p /var/run/sshd && \
@@ -89,16 +76,16 @@ RUN \
8976
/etc/machine-id \
9077
/var/lib/dbus/machine-id
9178

92-
COPY --from=unison /tmp/unison-2.51.2/src/unison /usr/local/bin/
93-
COPY --from=unison /tmp/unison-2.51.2/src/unison-fsmonitor /usr/local/bin/
79+
COPY --from=unison /tmp/unison-2.53.3/src/unison /usr/local/bin/
80+
COPY --from=unison /tmp/unison-2.53.3/src/unison-fsmonitor /usr/local/bin/
9481
COPY ./ce-dev-ownership.sh /opt/
9582
COPY ./ce-dev-ssh.sh /opt/
9683
COPY ./unison.sh /opt/
9784
COPY ./unison-startup.sh /opt/
9885
COPY ./procmailrc /etc/procmailrc
9986

10087
RUN \
101-
wget https://github.com/FiloSottile/mkcert/releases/download/v1.4.1/mkcert-v1.4.1-linux-amd64 -O /usr/local/bin/mkcert && \
88+
wget https://github.com/FiloSottile/mkcert/releases/download/v1.4.4/mkcert-v1.4.4-linux-amd64 -O /usr/local/bin/mkcert && \
10289
mkdir -p /home/ce-dev/deploy/live.local /home/ce-dev/.composer/cache /home/ce-dev/.nvm/versions/node /home/ce-dev/.local/share/mkcert && \
10390
chown -R ce-dev:ce-dev /home/ce-dev && \
10491
chmod +x /usr/local/bin/*

0 commit comments

Comments
 (0)