Skip to content

Bullseye upgrade pr devel #127

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 32 commits into from
Jul 20, 2023
Merged

Bullseye upgrade pr devel #127

Changes from all commits
Commits
Show all changes
32 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
9f5edb5
Upgrading base container to bullseye-slim.
gregharvey Jul 18, 2023
91a14ce
Merge branch 'devel' into bullseye_upgrade-PR-devel
gregharvey Jul 18, 2023
c1273ff
Merge branch 'bullseye_upgrade' into bullseye_upgrade-PR-devel
gregharvey Jul 18, 2023
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
29 changes: 8 additions & 21 deletions docker-images/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster as unison
FROM debian:bullseye-slim as unison
RUN \
set -x && \
export DEBIAN_FRONTEND=noninteractive && \
Expand All @@ -9,12 +9,12 @@ RUN \
wget \
ocaml-native-compilers && \
cd /tmp/ && \
wget https://github.com/bcpierce00/unison/archive/v2.51.2.tar.gz && \
tar -xzvf v2.51.2.tar.gz && \
cd /tmp/unison-2.51.2 && \
wget https://github.com/bcpierce00/unison/archive/v2.53.3.tar.gz && \
tar -xzvf v2.53.3.tar.gz && \
cd /tmp/unison-2.53.3 && \
make

FROM debian:buster
FROM debian:bullseye-slim

RUN \
set -x && \
Expand Down Expand Up @@ -54,19 +54,6 @@ RUN \
/var/log/* \
/tmp/*

# Temp workaround bug in system.d with kernel 5.8
RUN \
echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list && \
set -x && \
export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get -y -o Dpkg::Options::="--force-confnew" -t=buster-backports upgrade systemd && \
apt-get clean && \
rm -rf \
/var/lib/apt/lists/* \
/var/log/* \
/tmp/*

RUN \
echo 'UseDNS no' >> /etc/ssh/sshd_config && \
mkdir -p /var/run/sshd && \
Expand All @@ -89,16 +76,16 @@ RUN \
/etc/machine-id \
/var/lib/dbus/machine-id

COPY --from=unison /tmp/unison-2.51.2/src/unison /usr/local/bin/
COPY --from=unison /tmp/unison-2.51.2/src/unison-fsmonitor /usr/local/bin/
COPY --from=unison /tmp/unison-2.53.3/src/unison /usr/local/bin/
COPY --from=unison /tmp/unison-2.53.3/src/unison-fsmonitor /usr/local/bin/
COPY ./ce-dev-ownership.sh /opt/
COPY ./ce-dev-ssh.sh /opt/
COPY ./unison.sh /opt/
COPY ./unison-startup.sh /opt/
COPY ./procmailrc /etc/procmailrc

RUN \
wget https://github.com/FiloSottile/mkcert/releases/download/v1.4.1/mkcert-v1.4.1-linux-amd64 -O /usr/local/bin/mkcert && \
wget https://github.com/FiloSottile/mkcert/releases/download/v1.4.4/mkcert-v1.4.4-linux-amd64 -O /usr/local/bin/mkcert && \
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 && \
chown -R ce-dev:ce-dev /home/ce-dev && \
chmod +x /usr/local/bin/*
Expand Down