"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file ".docker/qgis3-build-deps-disco.dockerfile" between
QGIS-final-3_10_5.tar.gz and QGIS-final-3_10_6.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Long-term release (3.10.x series).

qgis3-build-deps-disco.dockerfile  (QGIS-final-3_10_5):qgis3-build-deps-disco.dockerfile  (QGIS-final-3_10_6)
FROM ubuntu:19.04 FROM ubuntu:20.04
MAINTAINER Denis Rouzaud <denis@opengis.ch> MAINTAINER Denis Rouzaud <denis@opengis.ch>
LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Ve rsion="1.0" LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Ve rsion="1.0"
# && echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xeni al main" >> /etc/apt/sources.list \ # && echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xeni al main" >> /etc/apt/sources.list \
# && echo "deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \ # && echo "deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
# && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 314DF160 \ # && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 314DF160 \
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y software-properties-common \ && apt-get install -y software-properties-common \
skipping to change at line 133 skipping to change at line 133
RUN unzip instantclient-basic-linux.x64-19.3.0.0.0dbru.zip RUN unzip instantclient-basic-linux.x64-19.3.0.0.0dbru.zip
RUN unzip instantclient-sdk-linux.x64-19.3.0.0.0dbru.zip RUN unzip instantclient-sdk-linux.x64-19.3.0.0.0dbru.zip
RUN unzip instantclient-sqlplus-linux.x64-19.3.0.0.0dbru.zip RUN unzip instantclient-sqlplus-linux.x64-19.3.0.0.0dbru.zip
ENV PATH="/instantclient_19_3:${PATH}" ENV PATH="/instantclient_19_3:${PATH}"
ENV LD_LIBRARY_PATH="/instantclient_19_3:${LD_LIBRARY_PATH}" ENV LD_LIBRARY_PATH="/instantclient_19_3:${LD_LIBRARY_PATH}"
# MSSQL: client side # MSSQL: client side
RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc /apt/sources.list.d/msprod.list RUN curl https://packages.microsoft.com/config/ubuntu/19.04/prod.list | tee /etc /apt/sources.list.d/msprod.list
RUN apt-get update RUN apt-get update
RUN ACCEPT_EULA=Y apt-get install -y msodbcsql17 mssql-tools RUN ACCEPT_EULA=Y apt-get install -y --allow-unauthenticated msodbcsql17 mssql-t ools
# Avoid sqlcmd termination due to locale -- see https://github.com/Microsoft/mss ql-docker/issues/163 # Avoid sqlcmd termination due to locale -- see https://github.com/Microsoft/mss ql-docker/issues/163
RUN echo "nb_NO.UTF-8 UTF-8" > /etc/locale.gen RUN echo "nb_NO.UTF-8 UTF-8" > /etc/locale.gen
RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
RUN locale-gen RUN locale-gen
RUN echo "alias python=python3" >> ~/.bash_aliases RUN echo "alias python=python3" >> ~/.bash_aliases
ENV QT_SELECT=5 ENV QT_SELECT=5
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)