GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[DOCKER] Small fixes to docker setup, imported from V2

Browse Source
This commit is contained in:
Hugo Sales 2020-05-07 21:56:39 +00:00 committed by Hugo Sales
parent bf88c97f4a
commit 1ce5661f70
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/bootstrap/bootstrap.sh
View File

@ -35,15 +35,15 @@ if [ ! -e "${lets_path}/live//options-ssl-nginx.conf" ] \
echo "### Requesting Let's Encrypt certificate for $root_domain ..." echo "### Requesting Let's Encrypt certificate for $root_domain ..."
# Format domain_args with the cartesian product of `root_domain` and `subdomains` # Format domain_args with the cartesian product of `root_domain` and `subdomains`
email_arg="--email $email" email_arg="--email ${email}"
domain_arg="-d $domain" domain_arg=$([ "${domain_root}" = "${domain}" ] && printf "-d ${domain_root}" || printf "-d ${domain_root} -d ${domain}")
# Ask Let's Encrypt to create certificates, if challenge passed # Ask Let's Encrypt to create certificates, if challenge passed
certbot certonly --webroot -w /var/www/certbot \ certbot certonly --webroot -w /var/www/certbot \
$email_arg \ ${email_arg} \
$domain_arg \ ${domain_arg} \
--non-interactive \ --non-interactive \
--rsa-key-size $rsa_key_size \ --rsa-key-size ${rsa_key_size} \
--agree-tos \ --agree-tos \
--force-renewal --force-renewal

4
docker/php/Dockerfile
View File

@ -1,9 +1,9 @@
FROM php:fpm-alpine FROM php:fpm-alpine
RUN apk update && apk add gettext-dev icu-dev zlib-dev libpng-dev gmp-dev \ RUN apk update && apk add gettext-dev icu-dev zlib-dev libpng-dev gmp-dev \
postgresql-dev postgresql-client composer > /dev/null mariadb-dev mariadb-client postgresql-dev postgresql-client composer > /dev/null
ARG exts=" bcmath exif gd gettext gmp intl mysqli opcache pdo_mysql" ARG exts=" bcmath exif gd gettext gmp intl mysqli opcache pdo pdo_mysql mysqli pdo_pgsql pgsql"
RUN apk add --virtual .phpize-deps $PHPIZE_DEPS \ RUN apk add --virtual .phpize-deps $PHPIZE_DEPS \
&& rm -rf /usr/share/php7 \ && rm -rf /usr/share/php7 \