Skip to content

Commit

Permalink
Use debian bullseye as base image for ddev-webimage, downgrades nginx…
Browse files Browse the repository at this point in the history
… to 1.18.0, fixes #3116 (#3102) [skip ci][ci skip]

* Bump to bullseye as base image
* Bump to use upstream bullseye base NOTE DOWNGRADE OF nginx to 1.18
  • Loading branch information
rfay committed Jul 28, 2021
1 parent c141572 commit 334f76e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions containers/ddev-webserver/Dockerfile
Expand Up @@ -3,7 +3,7 @@
### Build ddev-php-base from ddev-webserver-base
### ddev-php-base is the basic of ddev-php-prod
### and ddev-webserver-* (For DDEV-Local)
FROM drud/ddev-php-base:v1.17.7 as ddev-webserver-base
FROM drud/ddev-php-base:20210714_use_bullseye as ddev-webserver-base

ENV BACKDROP_DRUSH_VERSION=1.4.0
ENV MKCERT_VERSION=v1.4.6
Expand All @@ -19,9 +19,10 @@ ENV CAROOT /mnt/ddev-global-cache/mkcert
ARG TARGETPLATFORM
ARG BUILDPLATFORM

RUN wget -q -O /tmp/nginx_signing.key http://nginx.org/keys/nginx_signing.key && \
apt-key add /tmp/nginx_signing.key && \
echo "deb http://nginx.org/packages/debian/ $(lsb_release -sc) nginx" > /etc/apt/sources.list.d/nginx.list
#TODO: When upstream nginx package is ready for bullseye, use it.
#RUN wget -q -O /tmp/nginx_signing.key http://nginx.org/keys/nginx_signing.key && \
# apt-key add /tmp/nginx_signing.key && \
# echo "deb http://nginx.org/packages/debian/ $(lsb_release -sc) nginx" > /etc/apt/sources.list.d/nginx.list

ADD ddev-webserver-etc-skel /
RUN /sbin/mkhomedir_helper www-data
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Expand Up @@ -40,7 +40,7 @@ var DockerComposeFileFormatVersion = "3.6"
var WebImg = "drud/ddev-webserver"

// WebTag defines the default web image tag for drud dev
var WebTag = "v1.17.7" // Note that this can be overridden by make
var WebTag = "20210714_bullseye_web_image" // Note that this can be overridden by make

// DBImg defines the default db image used for applications.
var DBImg = "drud/ddev-dbserver"
Expand Down

0 comments on commit 334f76e

Please sign in to comment.