mirror of
https://github.com/tchapi/davis.git
synced 2025-04-11 08:02:21 +02:00
Keep version in docker-compose file, fix argument
This commit is contained in:
parent
a46e6bf366
commit
c0bcd4a4d6
@ -2,6 +2,8 @@ FROM php:7.3-fpm
|
||||
|
||||
LABEL maintainer="tchap@tchap.me"
|
||||
|
||||
ARG version
|
||||
|
||||
# Mail : configuration for ssmtp
|
||||
ARG email
|
||||
ARG mail_host
|
||||
@ -37,10 +39,10 @@ RUN docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
|
||||
&& docker-php-source delete
|
||||
|
||||
# Davis installation
|
||||
RUN cd /var/www/ && curl --silent -o v1.0.0.tar.gz -L https://github.com/tchapi/davis/archive/v1.0.0.tar.gz \
|
||||
&& tar xvzf v1.0.0.tar.gz \
|
||||
&& mv /var/www/davis-1.0.0 /var/www/davis \
|
||||
&& rm v1.0.0.tar.gz
|
||||
RUN cd /var/www/ && curl --silent -o ${version}.tar.gz -L https://github.com/tchapi/davis/archive/v${version}.tar.gz \
|
||||
&& tar xvzf ${version}.tar.gz \
|
||||
&& mv /var/www/davis-${version} /var/www/davis \
|
||||
&& rm ${version}.tar.gz
|
||||
|
||||
WORKDIR /var/www/davis
|
||||
|
||||
|
@ -27,9 +27,10 @@ services:
|
||||
context: ./
|
||||
dockerfile: ./Dockerfile
|
||||
args:
|
||||
version: "1.1.0"
|
||||
email: ${INVITE_FROM_ADDRESS}
|
||||
mail_host: ${MAIL_HOST}
|
||||
calendar_domain: ${HOSTNAME}
|
||||
hostname: ${HOSTNAME}
|
||||
mail_username: ${MAIL_USERNAME}
|
||||
mail_password: ${MAIL_PASSWORD}
|
||||
image: davis:master
|
||||
|
Loading…
x
Reference in New Issue
Block a user