Merge branch 'update-templates-for-9-2' into 'master'

vendor/Dockerfile/OpenJDK-alpine.Dockerfile

+FROM openjdk:8-alpine
+
+COPY . /usr/src/myapp
+WORKDIR /usr/src/myapp
+
+RUN javac Main.java
+
+CMD ["java", "Main"]

vendor/Dockerfile/OpenJDK.Dockerfile

+FROM openjdk:9
+
+COPY . /usr/src/myapp
+WORKDIR /usr/src/myapp
+
+RUN javac Main.java
+
+CMD ["java", "Main"]

vendor/Dockerfile/Python-alpine.Dockerfile

+FROM python:3.6-alpine
+
+# Edit with mysql-client, postgresql-client, sqlite3, etc. for your needs.
+# Or delete entirely if not needed.
+RUN apk --no-cache add postgresql-client
+
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
+# For Django
+EXPOSE 8000
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
+
+# For some other command
+# CMD ["python", "app.py"]

vendor/Dockerfile/Python.Dockerfile

+FROM python:3.6
+
+# Edit with mysql-client, postgresql-client, sqlite3, etc. for your needs.
+# Or delete entirely if not needed.
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        postgresql-client \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
+# For Django
+EXPOSE 8000
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
+
+# For some other command
+# CMD ["python", "app.py"]

vendor/gitignore/Global/Archives.gitignore

@@ -5,6 +5,7 @@
 *.rar
 *.zip
 *.gz
+*.tgz
 *.bzip
 *.bz2
 *.xz

vendor/gitignore/Global/JetBrains.gitignore

@@ -19,6 +19,9 @@
 .idea/**/gradle.xml
 .idea/**/libraries
 
+# CMake
+cmake-build-debug/
+
 # Mongo Explorer plugin:
 .idea/**/mongoSettings.xml
 

vendor/gitignore/Global/MicrosoftOffice.gitignore

@@ -13,4 +13,4 @@
 ~$*.ppt*
 
 # Visio autosave temporary files
-*.~vsdx
+*.~vsd*

vendor/gitignore/Magento.gitignore

@@ -3,14 +3,41 @@
 #--------------------------#
 
 /app/etc/local.xml
+
 /media/*
 !/media/.htaccess
+
+!/media/customer
+/media/customer/*
 !/media/customer/.htaccess
+
+!/media/dhl
+/media/dhl/*
 !/media/dhl/logo.jpg
+
+!/media/downloadable
+/media/downloadable/*
 !/media/downloadable/.htaccess
+
+!/media/xmlconnect
+/media/xmlconnect/*
+
+!/media/xmlconnect/custom
+/media/xmlconnect/custom/*
 !/media/xmlconnect/custom/ok.gif
+
+!/media/xmlconnect/original
+/media/xmlconnect/original/*
 !/media/xmlconnect/original/ok.gif
+
+!/media/xmlconnect/system
+/media/xmlconnect/system/*
 !/media/xmlconnect/system/ok.gif
+
 /var/*
 !/var/.htaccess
+
+!/var/package
+/var/package/*
 !/var/package/*.xml
+

vendor/gitignore/Python.gitignore

@@ -89,9 +89,13 @@ ENV/
 
 # Spyder project settings
 .spyderproject
+.spyproject
 
 # Rope project settings
 .ropeproject
 
 # mkdocs documentation
 /site
+
+# mypy
+.mypy_cache/

vendor/gitignore/Qt.gitignore

@@ -20,6 +20,7 @@
 *.qbs.user.*
 *.moc
 moc_*.cpp
+moc_*.h
 qrc_*.cpp
 ui_*.h
 Makefile*

vendor/gitignore/UnrealEngine.gitignore

@@ -54,6 +54,11 @@ Binaries/*
 # Builds
 Build/*
 
+# Whitelist PakBlacklist-<BuildConfiguration>.txt files
+!Build/*/
+Build/*/**
+!Build/*/PakBlacklist*.txt
+
 # Don't ignore icon files in Build
 !Build/**/*.ico