Dockerfile #1
3 changed files with 157 additions and 9 deletions
152
.idea/workspace.xml
generated
Normal file
152
.idea/workspace.xml
generated
Normal file
|
|
@ -0,0 +1,152 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="AutoImportSettings">
|
||||||
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
|
</component>
|
||||||
|
<component name="ChangeListManager">
|
||||||
|
<list default="true" id="e8e27777-24cc-4fe6-b421-f2ee0b12ac81" name="Changes" comment="# ---------------------------------------------------------- # Header - (type): Brief description # ---------------------------------------------------------- # * feat A new feature # * fix A bug fix # * docs Changes to documentation only # * style Style/format changes (whitespace, etc.) # * refactor Changes not related to a bug or feature # * perf Changes that affects performance # * test Changes that add/modify/correct tests # * build Changes to build system (configs, etc.) # * ci Changes to CI pipeline/workflow # ---------------------------------------------------------- (misc): PyCharm .idea files # ---------------------------------------------------------- # Body - More detailed description, if necessary # ---------------------------------------------------------- # * Motivation behind changes, more detail into how # functionality might be affected, etc. # ---------------------------------------------------------- # ---------------------------------------------------------- # Footer - Associated issues, PRs, etc. # ---------------------------------------------------------- # * Ex: Resolves Issue #207, see PR #15, etc. # ----------------------------------------------------------" />
|
||||||
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
|
</component>
|
||||||
|
<component name="FileTemplateManagerImpl">
|
||||||
|
<option name="RECENT_TEMPLATES">
|
||||||
|
<list>
|
||||||
|
<option value="Dockerfile" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
<component name="Git.Settings">
|
||||||
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||||
|
<map>
|
||||||
|
<entry key="$PROJECT_DIR$" value="main" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectColorInfo">{
|
||||||
|
"customColor": "",
|
||||||
|
"associatedIndex": 8
|
||||||
|
}</component>
|
||||||
|
<component name="ProjectId" id="2qOpYlPjXbYD9Fdgr95PcilpMKm" />
|
||||||
|
<component name="ProjectViewState">
|
||||||
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
|
<option name="showLibraryContents" value="true" />
|
||||||
|
</component>
|
||||||
|
<component name="PropertiesComponent"><![CDATA[{
|
||||||
|
"keyToString": {
|
||||||
|
"Python.server.executor": "Run",
|
||||||
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
|
"RunOnceActivity.git.unshallow": "true",
|
||||||
|
"git-widget-placeholder": "docker",
|
||||||
|
"last_opened_file_path": "/home/blake/Data/gitlab_repos/links",
|
||||||
|
"node.js.detected.package.eslint": "true",
|
||||||
|
"node.js.detected.package.tslint": "true",
|
||||||
|
"node.js.selected.package.eslint": "(autodetect)",
|
||||||
|
"node.js.selected.package.tslint": "(autodetect)",
|
||||||
|
"nodejs_package_manager_path": "npm",
|
||||||
|
"vue.rearranger.settings.migration": "true"
|
||||||
|
}
|
||||||
|
}]]></component>
|
||||||
|
<component name="SharedIndexes">
|
||||||
|
<attachedChunks>
|
||||||
|
<set>
|
||||||
|
<option value="bundled-js-predefined-d6986cc7102b-deb605915726-JavaScript-PY-243.22562.220" />
|
||||||
|
<option value="bundled-python-sdk-0fc6c617c4bd-9a18a617cbe4-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-243.22562.220" />
|
||||||
|
</set>
|
||||||
|
</attachedChunks>
|
||||||
|
</component>
|
||||||
|
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||||
|
<component name="TaskManager">
|
||||||
|
<task active="true" id="Default" summary="Default task">
|
||||||
|
<changelist id="e8e27777-24cc-4fe6-b421-f2ee0b12ac81" name="Changes" comment="" />
|
||||||
|
<created>1734543527156</created>
|
||||||
|
<option name="number" value="Default" />
|
||||||
|
<option name="presentableId" value="Default" />
|
||||||
|
<updated>1734543527156</updated>
|
||||||
|
<workItem from="1736106328284" duration="402000" />
|
||||||
|
<workItem from="1736116159041" duration="2254000" />
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00001" summary="# ---------------------------------------------------------- # Header - (type): Brief description # ---------------------------------------------------------- # * feat A new feature # * fix A bug fix # * docs Changes to documentation only # * style Style/format changes (whitespace, etc.) # * refactor Changes not related to a bug or feature # * perf Changes that affects performance # * test Changes that add/modify/correct tests # * build Changes to build system (configs, etc.) # * ci Changes to CI pipeline/workflow # ---------------------------------------------------------- (feat): Updated requirements.txt # ---------------------------------------------------------- # Body - More detailed description, if necessary # ---------------------------------------------------------- # * Motivation behind changes, more detail into how # functionality might be affected, etc. # ---------------------------------------------------------- # ---------------------------------------------------------- # Footer - Associated issues, PRs, etc. # ---------------------------------------------------------- # * Ex: Resolves Issue #207, see PR #15, etc. # ----------------------------------------------------------">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1736116414380</created>
|
||||||
|
<option name="number" value="00001" />
|
||||||
|
<option name="presentableId" value="LOCAL-00001" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1736116414380</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00002" summary="# ---------------------------------------------------------- # Header - (type): Brief description # ---------------------------------------------------------- # * feat A new feature # * fix A bug fix # * docs Changes to documentation only # * style Style/format changes (whitespace, etc.) # * refactor Changes not related to a bug or feature # * perf Changes that affects performance # * test Changes that add/modify/correct tests # * build Changes to build system (configs, etc.) # * ci Changes to CI pipeline/workflow # ---------------------------------------------------------- (feat): Cleaened up and added CORS # ---------------------------------------------------------- # Body - More detailed description, if necessary # ---------------------------------------------------------- # * Motivation behind changes, more detail into how # functionality might be affected, etc. # ---------------------------------------------------------- # ---------------------------------------------------------- # Footer - Associated issues, PRs, etc. # ---------------------------------------------------------- # * Ex: Resolves Issue #207, see PR #15, etc. # ----------------------------------------------------------">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1736116426759</created>
|
||||||
|
<option name="number" value="00002" />
|
||||||
|
<option name="presentableId" value="LOCAL-00002" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1736116426759</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00003" summary="# ---------------------------------------------------------- # Header - (type): Brief description # ---------------------------------------------------------- # * feat A new feature # * fix A bug fix # * docs Changes to documentation only # * style Style/format changes (whitespace, etc.) # * refactor Changes not related to a bug or feature # * perf Changes that affects performance # * test Changes that add/modify/correct tests # * build Changes to build system (configs, etc.) # * ci Changes to CI pipeline/workflow # ---------------------------------------------------------- (build): Add init Dockerfiile # ---------------------------------------------------------- # Body - More detailed description, if necessary # ---------------------------------------------------------- # * Motivation behind changes, more detail into how # functionality might be affected, etc. # ---------------------------------------------------------- # ---------------------------------------------------------- # Footer - Associated issues, PRs, etc. # ---------------------------------------------------------- # * Ex: Resolves Issue #207, see PR #15, etc. # ----------------------------------------------------------">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1736117393863</created>
|
||||||
|
<option name="number" value="00003" />
|
||||||
|
<option name="presentableId" value="LOCAL-00003" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1736117393863</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00004" summary="# ---------------------------------------------------------- # Header - (type): Brief description # ---------------------------------------------------------- # * feat A new feature # * fix A bug fix # * docs Changes to documentation only # * style Style/format changes (whitespace, etc.) # * refactor Changes not related to a bug or feature # * perf Changes that affects performance # * test Changes that add/modify/correct tests # * build Changes to build system (configs, etc.) # * ci Changes to CI pipeline/workflow # ---------------------------------------------------------- (misc): PyCharm .idea files # ---------------------------------------------------------- # Body - More detailed description, if necessary # ---------------------------------------------------------- # * Motivation behind changes, more detail into how # functionality might be affected, etc. # ---------------------------------------------------------- # ---------------------------------------------------------- # Footer - Associated issues, PRs, etc. # ---------------------------------------------------------- # * Ex: Resolves Issue #207, see PR #15, etc. # ----------------------------------------------------------">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1736117460875</created>
|
||||||
|
<option name="number" value="00004" />
|
||||||
|
<option name="presentableId" value="LOCAL-00004" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1736117460875</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="5" />
|
||||||
|
<servers />
|
||||||
|
</component>
|
||||||
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
|
<option name="version" value="3" />
|
||||||
|
</component>
|
||||||
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
|
<option name="TAB_STATES">
|
||||||
|
<map>
|
||||||
|
<entry key="MAIN">
|
||||||
|
<value>
|
||||||
|
<State>
|
||||||
|
<option name="FILTERS">
|
||||||
|
<map>
|
||||||
|
<entry key="branch">
|
||||||
|
<value>
|
||||||
|
<list>
|
||||||
|
<option value="origin/docker" />
|
||||||
|
</list>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</State>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
<component name="VcsManagerConfiguration">
|
||||||
|
<MESSAGE value="# ---------------------------------------------------------- # Header - (type): Brief description # ---------------------------------------------------------- # * feat A new feature # * fix A bug fix # * docs Changes to documentation only # * style Style/format changes (whitespace, etc.) # * refactor Changes not related to a bug or feature # * perf Changes that affects performance # * test Changes that add/modify/correct tests # * build Changes to build system (configs, etc.) # * ci Changes to CI pipeline/workflow # ---------------------------------------------------------- (feat): Updated requirements.txt # ---------------------------------------------------------- # Body - More detailed description, if necessary # ---------------------------------------------------------- # * Motivation behind changes, more detail into how # functionality might be affected, etc. # ---------------------------------------------------------- # ---------------------------------------------------------- # Footer - Associated issues, PRs, etc. # ---------------------------------------------------------- # * Ex: Resolves Issue #207, see PR #15, etc. # ----------------------------------------------------------" />
|
||||||
|
<MESSAGE value="# ---------------------------------------------------------- # Header - (type): Brief description # ---------------------------------------------------------- # * feat A new feature # * fix A bug fix # * docs Changes to documentation only # * style Style/format changes (whitespace, etc.) # * refactor Changes not related to a bug or feature # * perf Changes that affects performance # * test Changes that add/modify/correct tests # * build Changes to build system (configs, etc.) # * ci Changes to CI pipeline/workflow # ---------------------------------------------------------- (feat): Cleaened up and added CORS # ---------------------------------------------------------- # Body - More detailed description, if necessary # ---------------------------------------------------------- # * Motivation behind changes, more detail into how # functionality might be affected, etc. # ---------------------------------------------------------- # ---------------------------------------------------------- # Footer - Associated issues, PRs, etc. # ---------------------------------------------------------- # * Ex: Resolves Issue #207, see PR #15, etc. # ----------------------------------------------------------" />
|
||||||
|
<MESSAGE value="# ---------------------------------------------------------- # Header - (type): Brief description # ---------------------------------------------------------- # * feat A new feature # * fix A bug fix # * docs Changes to documentation only # * style Style/format changes (whitespace, etc.) # * refactor Changes not related to a bug or feature # * perf Changes that affects performance # * test Changes that add/modify/correct tests # * build Changes to build system (configs, etc.) # * ci Changes to CI pipeline/workflow # ---------------------------------------------------------- (build): Add init Dockerfiile # ---------------------------------------------------------- # Body - More detailed description, if necessary # ---------------------------------------------------------- # * Motivation behind changes, more detail into how # functionality might be affected, etc. # ---------------------------------------------------------- # ---------------------------------------------------------- # Footer - Associated issues, PRs, etc. # ---------------------------------------------------------- # * Ex: Resolves Issue #207, see PR #15, etc. # ----------------------------------------------------------" />
|
||||||
|
<MESSAGE value="# ---------------------------------------------------------- # Header - (type): Brief description # ---------------------------------------------------------- # * feat A new feature # * fix A bug fix # * docs Changes to documentation only # * style Style/format changes (whitespace, etc.) # * refactor Changes not related to a bug or feature # * perf Changes that affects performance # * test Changes that add/modify/correct tests # * build Changes to build system (configs, etc.) # * ci Changes to CI pipeline/workflow # ---------------------------------------------------------- (misc): PyCharm .idea files # ---------------------------------------------------------- # Body - More detailed description, if necessary # ---------------------------------------------------------- # * Motivation behind changes, more detail into how # functionality might be affected, etc. # ---------------------------------------------------------- # ---------------------------------------------------------- # Footer - Associated issues, PRs, etc. # ---------------------------------------------------------- # * Ex: Resolves Issue #207, see PR #15, etc. # ----------------------------------------------------------" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="# ---------------------------------------------------------- # Header - (type): Brief description # ---------------------------------------------------------- # * feat A new feature # * fix A bug fix # * docs Changes to documentation only # * style Style/format changes (whitespace, etc.) # * refactor Changes not related to a bug or feature # * perf Changes that affects performance # * test Changes that add/modify/correct tests # * build Changes to build system (configs, etc.) # * ci Changes to CI pipeline/workflow # ---------------------------------------------------------- (misc): PyCharm .idea files # ---------------------------------------------------------- # Body - More detailed description, if necessary # ---------------------------------------------------------- # * Motivation behind changes, more detail into how # functionality might be affected, etc. # ---------------------------------------------------------- # ---------------------------------------------------------- # Footer - Associated issues, PRs, etc. # ---------------------------------------------------------- # * Ex: Resolves Issue #207, see PR #15, etc. # ----------------------------------------------------------" />
|
||||||
|
</component>
|
||||||
|
<component name="XDebuggerManager">
|
||||||
|
<breakpoint-manager>
|
||||||
|
<breakpoints>
|
||||||
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
||||||
|
<url>file://$PROJECT_DIR$/services/user.py</url>
|
||||||
|
<option name="timeStamp" value="2" />
|
||||||
|
</line-breakpoint>
|
||||||
|
</breakpoints>
|
||||||
|
</breakpoint-manager>
|
||||||
|
</component>
|
||||||
|
<component name="com.intellij.coverage.CoverageDataManagerImpl">
|
||||||
|
<SUITE FILE_PATH="coverage/rideaware_api$server.coverage" NAME="server Coverage Results" MODIFIED="1736116334986" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
@ -1,13 +1,6 @@
|
||||||
Flask
|
Flask
|
||||||
<<<<<<< HEAD
|
|
||||||
sqlalchemy
|
|
||||||
flask_bcrypt
|
|
||||||
flask_sqlalchemy
|
|
||||||
python-dotenv
|
|
||||||
=======
|
|
||||||
flask_bcrypt
|
flask_bcrypt
|
||||||
flask_cors
|
flask_cors
|
||||||
flask_sqlalchemy
|
flask_sqlalchemy
|
||||||
python-dotenv
|
python-dotenv
|
||||||
werkzeug
|
werkzeug
|
||||||
>>>>>>> 81d9dbd ((feat): Updated requirements.txt)
|
|
||||||
|
|
@ -3,11 +3,14 @@ from flask import Flask
|
||||||
from models import db, bcrypt
|
from models import db, bcrypt
|
||||||
from routes.auth import auth_bp
|
from routes.auth import auth_bp
|
||||||
from dotenv import load_dotenv
|
from dotenv import load_dotenv
|
||||||
|
from flask_cors import CORS
|
||||||
|
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
|
CORS(app)
|
||||||
|
|
||||||
app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('DATABASE')
|
app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('DATABASE')
|
||||||
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
|
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
|
||||||
|
|
||||||
|
|
@ -20,4 +23,4 @@ with app.app_context():
|
||||||
db.create_all()
|
db.create_all()
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
app.run(debug=True)
|
app.run(debug=True)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue