Merge pull request #267 from docksal/feature/debian-bullseye

Debian 11 (bullseye)
docksal · Feb 20, 2022 · c7dc7c1 · c7dc7c1
2 parents 41472c9 + fa46354
commit c7dc7c1
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 28 deletions.
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-buster as cli
+FROM php:7.4-fpm-bullseye as cli
 
 ARG TARGETARCH
 ARG DEBIAN_FRONTEND=noninteractive
@@ -36,7 +36,7 @@ RUN set -xe; \
 	echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
 	# git-lfs repo
 	curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | apt-key add -; \
-	echo 'deb https://packagecloud.io/github/git-lfs/debian buster main' | tee /etc/apt/sources.list.d/github_git-lfs.list;
+	echo 'deb https://packagecloud.io/github/git-lfs/debian bullseye main' | tee /etc/apt/sources.list.d/github_git-lfs.list;
 
 # Additional packages
 RUN set -xe; \
@@ -59,7 +59,7 @@ RUN set -xe; \
 		libfcgi-bin \
 		mc \
 		msmtp \
-		# Debian 10 ships with MariaDB instead of MySQL
+		# Debian ships with MariaDB instead of MySQL
 		mariadb-client \
 		nano \
 		openssh-client \
@@ -111,7 +111,6 @@ ENV NOTVISIBLE "in users profile"
 # PHP
 RUN set -xe; \
 	# Note: essential build tools (g++, gcc, make, etc) are included upstream as persistent packages.
-	# See https://github.com/docker-library/php/blob/406fcd31e62d633f62ac0d7bc5fc29aa1b3929fc/7.2/buster/fpm/Dockerfile#L18-L40
 	buildDeps=" \
 		libc-client2007e-dev \
 		libfreetype6-dev \
@@ -140,7 +139,7 @@ RUN set -xe; \
 		libc-client2007e \
 		libfreetype6 \
 		libgpgme11 \
-		libicu63 \
+		libicu67 \
 		libjpeg62-turbo \
 		libldap-2.4-2 \
 		libmagickcore-6.q16-*-extra \
@@ -155,7 +154,6 @@ RUN set -xe; \
 		libxslt1.1 \
 		libzip4 \
 	;\
-	# --with-png-dir has been removed in PHP 7.4. libpng is required
 	docker-php-ext-configure >/dev/null gd \
 		--with-freetype \
 		--with-jpeg \
@@ -194,7 +192,6 @@ RUN set -xe; \
 		apcu \
 		gnupg \
 		imagick \
-		# Use memcached (not memcache) for PHP 7.x
 		memcached \
 		redis \
 		ssh2-beta \
@@ -220,7 +217,7 @@ RUN set -xe; \
 	if [ "${TARGETARCH}" = "amd64" ]; then \
 		# MSQSQL repo - msodbcsql17, pecl/sqlsrv and pecl/pdo_sqlsrv (PHP 7.0+ only)
 		curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \
-		echo 'deb https://packages.microsoft.com/debian/10/prod buster main' | tee /etc/apt/sources.list.d/mssql.list; \
+		echo 'deb https://packages.microsoft.com/debian/11/prod bullseye main' | tee /etc/apt/sources.list.d/mssql.list; \
 		\
 		buildDeps=" \
 			unixodbc-dev \
@@ -360,7 +357,7 @@ RUN set -e; \
 
 ## Ruby (installed as user) via rvm
 ## Note: Disabled. rvm + its build dependecies bloat the image (~80MB)
-## Debian 10 ships with Ruby 2.5, so we'll stick with that by default.
+## Debian 11 ships with Ruby 2.7, so we'll stick with that by default.
 ## It is still possible for the end user to switch to a different Ruby version via rvm.
 #ENV \
 #	RVM_VERSION_INSTALL=1.29.10 \

diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-fpm-buster as cli
+FROM php:8.0-fpm-bullseye as cli
 
 ARG TARGETARCH
 ARG DEBIAN_FRONTEND=noninteractive
@@ -36,7 +36,7 @@ RUN set -xe; \
 	echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
 	# git-lfs repo
 	curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | apt-key add -; \
-	echo 'deb https://packagecloud.io/github/git-lfs/debian buster main' | tee /etc/apt/sources.list.d/github_git-lfs.list;
+	echo 'deb https://packagecloud.io/github/git-lfs/debian bullseye main' | tee /etc/apt/sources.list.d/github_git-lfs.list;
 
 # Additional packages
 RUN set -xe; \
@@ -59,7 +59,7 @@ RUN set -xe; \
 		libfcgi-bin \
 		mc \
 		msmtp \
-		# Debian 10 ships with MariaDB instead of MySQL
+		# Debian ships with MariaDB instead of MySQL
 		mariadb-client \
 		nano \
 		openssh-client \
@@ -111,7 +111,6 @@ ENV NOTVISIBLE "in users profile"
 # PHP
 RUN set -xe; \
 	# Note: essential build tools (g++, gcc, make, etc) are included upstream as persistent packages.
-	# See https://github.com/docker-library/php/blob/406fcd31e62d633f62ac0d7bc5fc29aa1b3929fc/7.2/buster/fpm/Dockerfile#L18-L40
 	buildDeps=" \
 		libc-client2007e-dev \
 		libfreetype6-dev \
@@ -140,7 +139,7 @@ RUN set -xe; \
 		libc-client2007e \
 		libfreetype6 \
 		libgpgme11 \
-		libicu63 \
+		libicu67 \
 		libjpeg62-turbo \
 		libldap-2.4-2 \
 		libmagickcore-6.q16-*-extra \
@@ -218,7 +217,7 @@ RUN set -xe; \
 	if [ "${TARGETARCH}" = "amd64" ]; then \
 		# MSQSQL repo - msodbcsql17, pecl/sqlsrv and pecl/pdo_sqlsrv (PHP 7.0+ only)
 		curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \
-		echo 'deb https://packages.microsoft.com/debian/10/prod buster main' | tee /etc/apt/sources.list.d/mssql.list; \
+		echo 'deb https://packages.microsoft.com/debian/11/prod bullseye main' | tee /etc/apt/sources.list.d/mssql.list; \
 		\
 		buildDeps=" \
 			unixodbc-dev \
@@ -358,7 +357,7 @@ RUN set -e; \
 
 ## Ruby (installed as user) via rvm
 ## Note: Disabled. rvm + its build dependecies bloat the image (~80MB)
-## Debian 10 ships with Ruby 2.5, so we'll stick with that by default.
+## Debian 11 ships with Ruby 2.7, so we'll stick with that by default.
 ## It is still possible for the end user to switch to a different Ruby version via rvm.
 #ENV \
 #	RVM_VERSION_INSTALL=1.29.10 \

diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-fpm-buster as cli
+FROM php:8.1-fpm-bullseye as cli
 
 ARG TARGETARCH
 ARG DEBIAN_FRONTEND=noninteractive
@@ -36,7 +36,7 @@ RUN set -xe; \
 	echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
 	# git-lfs repo
 	curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | apt-key add -; \
-	echo 'deb https://packagecloud.io/github/git-lfs/debian buster main' | tee /etc/apt/sources.list.d/github_git-lfs.list;
+	echo 'deb https://packagecloud.io/github/git-lfs/debian bullseye main' | tee /etc/apt/sources.list.d/github_git-lfs.list;
 
 # Additional packages
 RUN set -xe; \
@@ -59,7 +59,7 @@ RUN set -xe; \
 		libfcgi-bin \
 		mc \
 		msmtp \
-		# Debian 10 ships with MariaDB instead of MySQL
+		# Debian ships with MariaDB instead of MySQL
 		mariadb-client \
 		nano \
 		openssh-client \
@@ -111,7 +111,6 @@ ENV NOTVISIBLE "in users profile"
 # PHP
 RUN set -xe; \
 	# Note: essential build tools (g++, gcc, make, etc) are included upstream as persistent packages.
-	# See https://github.com/docker-library/php/blob/406fcd31e62d633f62ac0d7bc5fc29aa1b3929fc/7.2/buster/fpm/Dockerfile#L18-L40
 	buildDeps=" \
 		libc-client2007e-dev \
 		libfreetype6-dev \
@@ -140,7 +139,7 @@ RUN set -xe; \
 		libc-client2007e \
 		libfreetype6 \
 		libgpgme11 \
-		libicu63 \
+		libicu67 \
 		libjpeg62-turbo \
 		libldap-2.4-2 \
 		libmagickcore-6.q16-*-extra \
@@ -218,7 +217,7 @@ RUN set -xe; \
 	if [ "${TARGETARCH}" = "amd64" ]; then \
 		# MSQSQL repo - msodbcsql17, pecl/sqlsrv and pecl/pdo_sqlsrv (PHP 7.0+ only)
 		curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \
-		echo 'deb https://packages.microsoft.com/debian/10/prod buster main' | tee /etc/apt/sources.list.d/mssql.list; \
+		echo 'deb https://packages.microsoft.com/debian/11/prod bullseye main' | tee /etc/apt/sources.list.d/mssql.list; \
 		\
 		buildDeps=" \
 			unixodbc-dev \
@@ -358,7 +357,7 @@ RUN set -e; \
 
 ## Ruby (installed as user) via rvm
 ## Note: Disabled. rvm + its build dependecies bloat the image (~80MB)
-## Debian 10 ships with Ruby 2.5, so we'll stick with that by default.
+## Debian 11 ships with Ruby 2.7, so we'll stick with that by default.
 ## It is still possible for the end user to switch to a different Ruby version via rvm.
 #ENV \
 #	RVM_VERSION_INSTALL=1.29.10 \

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2017 Docksal
+Copyright (c) 2016-2022 Docksal
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ This image(s) is part of the [Docksal](https://docksal.io) image library.
 
 ## Features
 
+- Based on the official php-fpm Debian 11 (bullseye) images 
 - php/php-fpm (w/ xdebug), nodejs (via nvm), python, ruby
 - Framework specific tools for Drupal and Wordpress
 - Miscellaneous cli tools for day to day web development
@@ -89,11 +90,11 @@ Then, use `nvm use 11.6.0` to use it in the current session or `nvm alias defaul
 
 ## Python
 
-This image comes with a system level installed Python version from upstream (Debian 9).
+This image comes with a system level installed Python version from upstream (Debian 11).
 
 ## Ruby
 
-This image comes with a system level installed Ruby version from upstream (Debian 9).
+This image comes with a system level installed Ruby version from upstream (Debian 11).
 
 ## Notable console tools
 

diff --git a/tests/test.bats b/tests/test.bats
@@ -298,8 +298,8 @@ _healthcheck_wait ()
 
 	# ruby
 	#run docker exec -u docker "$NAME" bash -lc 'ruby --version | grep "${RUBY_VERSION_INSTALL}"'
-	# Default Ruby version in Debian 10 = 2.5.x
-	run docker exec -u docker "$NAME" bash -lc 'ruby --version | grep "ruby 2.5"'
+	# Default Ruby version in Debian 11 = 2.7.x
+	run docker exec -u docker "$NAME" bash -lc 'ruby --version | grep "ruby 2.7"'
 	[[ ${status} == 0 ]]
 	unset output