Commit a03f8f14 authored by Timothy Andrew's avatar Timothy Andrew

Update gitignore, dockerfile, and license templates for 9.2.

parent 6386e42f
FROM openjdk:8-alpine
COPY . /usr/src/myapp
WORKDIR /usr/src/myapp
RUN javac Main.java
CMD ["java", "Main"]
FROM openjdk:9
COPY . /usr/src/myapp
WORKDIR /usr/src/myapp
RUN javac Main.java
CMD ["java", "Main"]
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"]
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"]
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*.rar *.rar
*.zip *.zip
*.gz *.gz
*.tgz
*.bzip *.bzip
*.bz2 *.bz2
*.xz *.xz
......
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
.idea/**/gradle.xml .idea/**/gradle.xml
.idea/**/libraries .idea/**/libraries
# CMake
cmake-build-debug/
# Mongo Explorer plugin: # Mongo Explorer plugin:
.idea/**/mongoSettings.xml .idea/**/mongoSettings.xml
......
...@@ -13,4 +13,4 @@ ...@@ -13,4 +13,4 @@
~$*.ppt* ~$*.ppt*
# Visio autosave temporary files # Visio autosave temporary files
*.~vsdx *.~vsd*
...@@ -3,14 +3,41 @@ ...@@ -3,14 +3,41 @@
#--------------------------# #--------------------------#
/app/etc/local.xml /app/etc/local.xml
/media/* /media/*
!/media/.htaccess !/media/.htaccess
!/media/customer
/media/customer/*
!/media/customer/.htaccess !/media/customer/.htaccess
!/media/dhl
/media/dhl/*
!/media/dhl/logo.jpg !/media/dhl/logo.jpg
!/media/downloadable
/media/downloadable/*
!/media/downloadable/.htaccess !/media/downloadable/.htaccess
!/media/xmlconnect
/media/xmlconnect/*
!/media/xmlconnect/custom
/media/xmlconnect/custom/*
!/media/xmlconnect/custom/ok.gif !/media/xmlconnect/custom/ok.gif
!/media/xmlconnect/original
/media/xmlconnect/original/*
!/media/xmlconnect/original/ok.gif !/media/xmlconnect/original/ok.gif
!/media/xmlconnect/system
/media/xmlconnect/system/*
!/media/xmlconnect/system/ok.gif !/media/xmlconnect/system/ok.gif
/var/* /var/*
!/var/.htaccess !/var/.htaccess
!/var/package
/var/package/*
!/var/package/*.xml !/var/package/*.xml
...@@ -89,9 +89,13 @@ ENV/ ...@@ -89,9 +89,13 @@ ENV/
# Spyder project settings # Spyder project settings
.spyderproject .spyderproject
.spyproject
# Rope project settings # Rope project settings
.ropeproject .ropeproject
# mkdocs documentation # mkdocs documentation
/site /site
# mypy
.mypy_cache/
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
*.qbs.user.* *.qbs.user.*
*.moc *.moc
moc_*.cpp moc_*.cpp
moc_*.h
qrc_*.cpp qrc_*.cpp
ui_*.h ui_*.h
Makefile* Makefile*
......
...@@ -54,6 +54,11 @@ Binaries/* ...@@ -54,6 +54,11 @@ Binaries/*
# Builds # Builds
Build/* Build/*
# Whitelist PakBlacklist-<BuildConfiguration>.txt files
!Build/*/
Build/*/**
!Build/*/PakBlacklist*.txt
# Don't ignore icon files in Build # Don't ignore icon files in Build
!Build/**/*.ico !Build/**/*.ico
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment