diff --git a/Dockerfile b/Dockerfile index eea86d10..e272d699 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,33 +5,36 @@ ARG VERSION ENV VERSION $VERSION ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ + +# NodeJs + +RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \ + && apt install -y --no-install-recommends nodejs + +# Apache + +RUN apt install -y --no-install-recommends \ + apache2 \ + libapache2-mod-php \ + && . /etc/apache2/envvars \ + && ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log" \ + && ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log" \ + && ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log" + +RUN a2dissite 000-default + +# Hedera + +RUN apt install -y --no-install-recommends \ curl \ ca-certificates \ gnupg2 \ && curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \ && echo "deb http://apt.verdnatura.es/ jessie main" \ > /etc/apt/sources.list.d/vn.list \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - apache2 \ - libapache2-mod-php \ - && rm -rf /var/lib/apt/lists/* \ - && . /etc/apache2/envvars \ - && ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log" \ - && ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log" \ - && ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log" + && apt update -RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \ - && apt-get install -y --no-install-recommends nodejs \ - && rm -rf /var/lib/apt/lists/* - -RUN a2dissite 000-default - -# Precaching dependencies -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ +RUN apt install -y --no-install-recommends \ php-image-text \ php-text-captcha \ php-apcu \ @@ -41,8 +44,8 @@ RUN apt-get update \ ARG BUILD_ID=unknown RUN echo $VERSION -RUN apt-get update \ - && apt-get install -y php-vn-lib hedera-web=$VERSION \ +RUN apt update \ + && apt install -y php-vn-lib hedera-web=$VERSION \ && rm -rf /var/lib/apt/lists/* CMD ["apachectl", "-D", "FOREGROUND"] diff --git a/debian/changelog b/debian/changelog index 5a212588..043daa34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.407.84) stable; urgency=low +hedera-web (1.408.10) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index 663caff0..e3f1372d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.407.84", + "version": "1.408.10", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": {