Skip to content
This repository has been archived by the owner on Jul 6, 2022. It is now read-only.

NCBD-166 flatten repo #51

Open
wants to merge 3 commits into
base: tooling-pme
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,5 @@ venv.bak/
.idea/
data/

.env.*
.env.*
.DS_Store
12 changes: 3 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
[submodule "harvester"]
path = harvester
url = https://github.com/polymathnetwork/polkascan-pre-harvester.git
[submodule "explorer-api"]
path = explorer-api
url = https://github.com/PolymathNetwork/polkascan-pre-explorer-api.git
[submodule "explorer-gui"]
path = explorer-gui
url = https://github.com/PolymathNetwork/polkascan-pre-explorer-gui.git
[submodule "polkascan-explorer-gui"]
path = pm-explorer-gui/explorer-gui
url = https://github.com/polkascan/polkascan-explorer-gui.git
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have removed the submodules and copied the folders directly on the project. However, we need to have polkascan-explorer-gui as a submodule, and that is fine.

6 changes: 6 additions & 0 deletions docker-compose-alcyon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ version: '3'

services:
explorer-api:
build: pm-explorer-api/.
Copy link
Author

@Tamir-Polymath Tamir-Polymath May 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to rename the project from explorer-api to pm-explorer-api because github was previously confused when we removed the submodule and kept the folder name.

same applies to explorer-gui and harvester submodules

image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/alcyon-explorer-api:latest
hostname: explorer-api
ports:
Expand Down Expand Up @@ -32,6 +33,7 @@ services:
- SUBSTRATE_RPC_URL=${SUBSTRATE_RPC_URL}

harvester-api:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/polymesh-harvester:latest
hostname: harvester-api
volumes:
Expand Down Expand Up @@ -62,6 +64,7 @@ services:
- SUBSTRATE_RPC_URL=${SUBSTRATE_RPC_URL}

harvester-worker:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/polymesh-harvester:latest
volumes:
- "/usr/src/app"
Expand All @@ -77,6 +80,7 @@ services:
environment: *env

harvester-beat:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/polymesh-harvester:latest
volumes:
- "/usr/src/app"
Expand All @@ -93,6 +97,7 @@ services:
environment: *env

harvester-monitor:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/polymesh-harvester:latest
ports:
- "5555:5555"
Expand All @@ -119,6 +124,7 @@ services:
awslogs-stream-prefix: redis

explorer-gui:
build: pm-explorer-gui/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/alcyon-explorer-gui:latest
ports:
- '80:80'
Expand Down
14 changes: 7 additions & 7 deletions docker-compose-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ version: '3.2'
services:

explorer-api:
build: explorer-api/.
build: pm-explorer-api/.
image: polkascan/pre-explorer-api:latest
hostname: explorer-api
volumes:
- './explorer-api:/usr/src/app'
- './pm-explorer-api:/usr/src/app'
command: ./start.sh
environment:
- PYTHONPATH=/usr/src/app
Expand All @@ -24,7 +24,7 @@ services:
- mysql

harvester-api:
build: harvester/.
build: pm-harvester/.
image: polkascan/pre-harvester:latest
hostname: harvester-api
volumes:
Expand All @@ -50,7 +50,7 @@ services:
- mysql

harvester-worker:
build: harvester/.
build: pm-harvester/.
image: polkascan/pre-harvester:latest
volumes:
- './harvester:/usr/src/app'
Expand All @@ -61,7 +61,7 @@ services:
- mysql

harvester-beat:
build: harvester/.
build: pm-harvester/.
image: polkascan/pre-harvester:latest
volumes:
- './harvester:/usr/src/app'
Expand All @@ -72,7 +72,7 @@ services:
- redis

harvester-monitor:
build: harvester/.
build: pm-harvester/.
image: polkascan/pre-harvester:latest
ports:
- '5555:5555'
Expand All @@ -98,7 +98,7 @@ services:
explorer-gui:
image: polkascan/pre-explorer-gui:latest
build:
context: explorer-gui/.
context: pm-explorer-gui/.
args:
- NETWORK_NAME=${NETWORK_NAME}
- NETWORK_ID=${NETWORK_ID}
Expand Down
6 changes: 6 additions & 0 deletions docker-compose-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ version: '3'

services:
explorer-api:
build: pm-explorer-api/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-explorer-api:latest
hostname: explorer-api
links:
Expand Down Expand Up @@ -30,6 +31,7 @@ services:
- SUBSTRATE_RPC_URL=${SUBSTRATE_RPC_URL}

harvester-api:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-harvester:latest
hostname: harvester-api
volumes:
Expand Down Expand Up @@ -60,6 +62,7 @@ services:
- SUBSTRATE_RPC_URL=${SUBSTRATE_RPC_URL}

harvester-worker:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-harvester:latest
volumes:
- "/usr/src/app"
Expand All @@ -75,6 +78,7 @@ services:
environment: *env

harvester-beat:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-harvester:latest
volumes:
- "/usr/src/app"
Expand All @@ -91,6 +95,7 @@ services:
environment: *env

harvester-monitor:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-harvester:latest
ports:
- "5555:5555"
Expand All @@ -117,6 +122,7 @@ services:
awslogs-stream-prefix: redis

explorer-gui:
build: pm-explorer-gui/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-explorer-gui:latest
ports:
- '80:80'
Expand Down
6 changes: 6 additions & 0 deletions docker-compose-tooling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ version: '3'

services:
explorer-api:
build: pm-explorer-api/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-explorer:latest
hostname: explorer-api
ports:
Expand Down Expand Up @@ -32,6 +33,7 @@ services:
- SUBSTRATE_RPC_URL=${SUBSTRATE_RPC_URL}

harvester-api:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-harvester:latest
hostname: harvester-api
volumes:
Expand Down Expand Up @@ -62,6 +64,7 @@ services:
- SUBSTRATE_RPC_URL=${SUBSTRATE_RPC_URL}

harvester-worker:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-harvester:latest
volumes:
- "/usr/src/app"
Expand All @@ -77,6 +80,7 @@ services:
environment: *env

harvester-beat:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-harvester:latest
volumes:
- "/usr/src/app"
Expand All @@ -93,6 +97,7 @@ services:
environment: *env

harvester-monitor:
build: pm-harvester/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-harvester:latest
ports:
- "5555:5555"
Expand All @@ -119,6 +124,7 @@ services:
awslogs-stream-prefix: redis

explorer-gui:
build: pm-explorer-gui/.
image: 414255671868.dkr.ecr.us-east-2.amazonaws.com/tooling-explorer-gui:latest
ports:
- '80:80'
Expand Down
1 change: 0 additions & 1 deletion explorer-api
Submodule explorer-api deleted from cb0985
1 change: 0 additions & 1 deletion explorer-gui
Submodule explorer-gui deleted from 515dca
1 change: 0 additions & 1 deletion harvester
Submodule harvester deleted from 3ff769
58 changes: 58 additions & 0 deletions pm-explorer-api/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Created by .ignore support plugin (hsz.mobi)
### Python template
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

data/
logs/
frontend/
105 changes: 105 additions & 0 deletions pm-explorer-api/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site
data/
# mypy
.mypy_cache/
.idea
Loading