cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

making nodejs version dynamic and LTS as default

Browse Source
This commit is contained in:
Simon Martín 2019-02-12 15:02:59 +01:00
parent 1ba6480110
commit 6c7c0eb7e7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/Dockerfile-nodejs10-xenial-pg101:postgis-2.4.4.6 → docker/Dockerfile-nodejs-xenial-pg101:postgis-2.4.4.6
View File

@ -6,7 +6,7 @@ ENV NPROCS 1
ENV JOBS 1 ENV JOBS 1
ENV CXX g++-4.9 ENV CXX g++-4.9
ENV PGUSER postgres ENV PGUSER postgres
ENV NODEJS_VERSION 10.15.1 ENV NODEJS_VERSION --lts
# Add external repos # Add external repos
RUN set -ex \ RUN set -ex \
@ -19,6 +19,7 @@ RUN set -ex \
&& add-apt-repository -y ppa:cartodb/postgresql-10 \ && add-apt-repository -y ppa:cartodb/postgresql-10 \
&& add-apt-repository -y ppa:cartodb/gis \ && add-apt-repository -y ppa:cartodb/gis \
&& curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash \ && curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash \
&& . ~/.nvm/nvm.sh \
&& locale-gen en_US.UTF-8 \ && locale-gen en_US.UTF-8 \
&& update-locale LANG=en_US.UTF-8 && update-locale LANG=en_US.UTF-8
@ -83,14 +84,11 @@ RUN set -ex \
&& psql -c "CREATE EXTENSION postgis" template_postgis \ && psql -c "CREATE EXTENSION postgis" template_postgis \
&& /etc/init.d/postgresql stop && /etc/init.d/postgresql stop
RUN set -ex \ WORKDIR /srv
&& . ~/.nvm/nvm.sh \ EXPOSE 5858
CMD /etc/init.d/postgresql start \
&& nvm install $NODEJS_VERSION \ && nvm install $NODEJS_VERSION \
&& nvm alias default $NODEJS_VERSION \ && nvm alias default $NODEJS_VERSION \
&& nvm use default && nvm use default
WORKDIR /srv
EXPOSE 5858
CMD /etc/init.d/postgresql start