From 2e83132d8996da19cd7d4b74336da7aafe7f2591 Mon Sep 17 00:00:00 2001 From: Fabian Lamprecht Date: Mon, 11 Feb 2019 15:27:59 +0100 Subject: [PATCH] update to v.1.4.0 --- config/services.yaml | 4 ++++ docker/Dockerfile | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/config/services.yaml b/config/services.yaml index 0110aa9..9e7f4a0 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -7,6 +7,10 @@ parameters: webroot: '%kernel.project_dir%/public' strichliste: + paypal: + enabled: false + recipient: "foo@bar.de" + fee: 0 user: # See http://de.php.net/manual/en/datetime.formats.relative.php diff --git a/docker/Dockerfile b/docker/Dockerfile index f10e9f9..84f6052 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,10 +7,13 @@ RUN apk --no-cache add ca-certificates \ RUN mkdir /source WORKDIR /source -RUN curl -Lo strichliste.tar.gz https://github.com/strichliste/server/releases/download/v1.2.3/strichliste.tar.gz +RUN curl -Lo strichliste.tar.gz https://github.com/strichliste/strichliste-backend/releases/download/v1.4.0/strichliste-backend.tar.gz RUN tar -xf strichliste.tar.gz RUN rm -r strichliste.tar.gz +RUN curl -Lo strichliste-frontend.tar.gz https://github.com/strichliste/strichliste-web-frontend/releases/download/v1.3.1/strichliste-web-frontend.tar.gz +RUN tar -xf strichliste-frontend.tar.gz --strip 1 -C public/ + FROM alpine:3.8 RUN apk --no-cache add ca-certificates \ @@ -28,7 +31,8 @@ RUN apk --no-cache add ca-certificates \ php7-pdo_mysql \ php7-fpm \ nginx \ - bash + bash \ + yarn COPY --from=release /source source @@ -49,8 +53,8 @@ COPY ./config/www.conf /etc/php7/php-fpm.d/www.conf COPY ./config/nginx.conf /etc/nginx/nginx.conf COPY ./config/default.conf /etc/nginx/conf.d/default.conf -RUN cp /source/var/app.db.example /source/app.db.example -RUN cp /source/var/app.db.example /source/var/app.db +COPY ./data/app.db.empty /source/app.db.example +COPY ./data/app.db.empty /source/var/app.db VOLUME /source/var