← Back to team overview

wordpress-charmers team mailing list archive

Re: [Merge] ~barryprice/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master

 

Two comments inline

Diff comments:

> diff --git a/Dockerfile b/Dockerfile
> index d9d9d67..ae922d5 100644
> --- a/Dockerfile
> +++ b/Dockerfile
> @@ -8,21 +8,16 @@ ARG BUILD_DATE
>  
>  LABEL org.label-schema.build-date=$BUILD_DATE
>  
> +ENV APACHE_CONFDIR=/etc/apache2
> +ENV APACHE_ENVVARS=/etc/apache2/envvars
> +
>  # Avoid interactive prompts
>  RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
>  
> -# Update all packages, remove cruft
> +# Update all packages, remove cruft, install required packages, configure apache

The "remove cruft" comment now doesn't quite make sense. I think it's worth updating it to say that docker does clean up for us.

>  RUN apt-get update && apt-get -y dist-upgrade \
>      && apt-get --purge autoremove -y \
> -    && apt-get clean \
> -    && rm -rf /var/lib/apt/lists/*
> -
> -# install and configure apache2 (--no-install-recommends as we don't need ssl-cert)
> -ENV APACHE_CONFDIR=/etc/apache2
> -ENV APACHE_ENVVARS=/etc/apache2/envvars
> -RUN apt-get update \
> -    && apt-get install -y --no-install-recommends apache2 \
> -    && rm -rf /var/lib/apt/lists/* \
> +    && apt-get install -y apache2 php libapache2-mod-php php-mysql php-gd curl ssl-cert pwgen \

Do we know for sure that we can't use --no-install-recommends?

>      && sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \
>      && . "$APACHE_ENVVARS" \
>      && for dir in "$APACHE_LOCK_DIR" "$APACHE_RUN_DIR" "$APACHE_LOG_DIR"; do rm -rvf "$dir"; mkdir -p "$dir"; chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; chmod 777 "$dir";  done \


-- 
https://code.launchpad.net/~barryprice/charm-k8s-wordpress/+git/wordpress-k8s-image-builder/+merge/377920
Your team Wordpress Charmers is requested to review the proposed merge of ~barryprice/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master.


References