Compare commits
25 Commits
docs-reshu
...
18294cec43
Author | SHA1 | Date | |
---|---|---|---|
18294cec43 | |||
982556a2c5 | |||
13646e64da | |||
67149f437a | |||
308ac05fe6 | |||
c378c2b287 | |||
5367822747 | |||
e295b4420c | |||
e4180b8306 | |||
5cd5126039 | |||
f8e9ab2482 | |||
8c0c613392 | |||
50ee1144f9 | |||
c4ba5ea197 | |||
08eb38dc57 | |||
33f4551cf4 | |||
0fa7fb28b5 | |||
be6e72028c | |||
bf7487f4f0 | |||
8b0ce0ba71 | |||
bca570882e | |||
f3ae9aae23 | |||
827ca4a50b | |||
f999adaf71 | |||
8f2becb9ee |
13
.drone.yml
Normal file
13
.drone.yml
Normal file
@ -0,0 +1,13 @@
|
||||
---
|
||||
kind: pipeline
|
||||
name: publish docker image
|
||||
steps:
|
||||
- name: build and publish
|
||||
image: plugins/docker
|
||||
settings:
|
||||
username:
|
||||
from_secret: docker_reg_username_3wc
|
||||
password:
|
||||
from_secret: docker_reg_passwd_3wc
|
||||
repo: 3wordchant/capsul-flask
|
||||
tags: ${DRONE_COMMIT_BRANCH}
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,5 +1,6 @@
|
||||
notes.txt
|
||||
.env
|
||||
.env.bak
|
||||
.vscode
|
||||
|
||||
*.pyc
|
||||
|
48
Dockerfile
Normal file
48
Dockerfile
Normal file
@ -0,0 +1,48 @@
|
||||
FROM python:3.8-alpine as build
|
||||
|
||||
RUN apk add --no-cache \
|
||||
build-base \
|
||||
gcc \
|
||||
gettext \
|
||||
git \
|
||||
jpeg-dev \
|
||||
libffi-dev \
|
||||
libjpeg \
|
||||
musl-dev \
|
||||
postgresql-dev \
|
||||
python3-dev \
|
||||
zlib-dev
|
||||
|
||||
RUN mkdir -p /app/{code,venv}
|
||||
WORKDIR /app/code
|
||||
COPY Pipfile Pipfile.lock /app/code/
|
||||
|
||||
RUN python3 -m venv /app/venv
|
||||
RUN pip install pipenv setuptools
|
||||
ENV PATH="/app/venv/bin:$PATH" VIRTUAL_ENV="/app/venv"
|
||||
RUN pip install wheel cppy
|
||||
# Install dependencies into the virtual environment with Pipenv
|
||||
RUN pipenv install --deploy --verbose
|
||||
|
||||
FROM python:3.8-alpine
|
||||
|
||||
RUN apk add --no-cache \
|
||||
cloud-utils \
|
||||
libjpeg \
|
||||
libpq \
|
||||
libstdc++ \
|
||||
libvirt-client \
|
||||
openssh-client \
|
||||
virt-install
|
||||
|
||||
COPY . /app/code/
|
||||
WORKDIR /app/code
|
||||
|
||||
COPY --from=build /app/venv /app/venv
|
||||
ENV PATH="/app/venv/bin:$PATH" VIRTUAL_ENV="/app/venv"
|
||||
|
||||
CMD ["gunicorn", "--bind", "0.0.0.0:5000", "-k", "gevent", "--worker-connections", "1000", "app:app"]
|
||||
|
||||
VOLUME /app/code
|
||||
|
||||
EXPOSE 5000
|
@ -26,8 +26,24 @@ class StdoutMockFlaskMail:
|
||||
def send(self, message: Message):
|
||||
current_app.logger.info(f"Email would have been sent if configured:\n\nto: {','.join(message.recipients)}\nsubject: {message.subject}\nbody:\n\n{message.body}\n\n")
|
||||
|
||||
|
||||
load_dotenv(find_dotenv())
|
||||
|
||||
for var_name in [
|
||||
"SPOKE_HOST_TOKEN", "HUB_TOKEN", "STRIPE_SECRET_KEY",
|
||||
"BTCPAY_PRIVATE_KEY", "MAIL_PASSWORD"
|
||||
]:
|
||||
var = os.environ.get(f"{var_name}_FILE")
|
||||
if not var:
|
||||
continue
|
||||
|
||||
if not os.path.isfile(var):
|
||||
continue
|
||||
|
||||
with open(var) as secret_file:
|
||||
os.environ[var_name] = secret_file.read().rstrip('\n')
|
||||
del os.environ[f"{var_name}_FILE"]
|
||||
|
||||
app = Flask(__name__)
|
||||
|
||||
app.config.from_mapping(
|
||||
@ -140,7 +156,7 @@ else:
|
||||
app.config['HTTP_CLIENT'] = MyHTTPClient(timeout_seconds=int(app.config['INTERNAL_HTTP_TIMEOUT_SECONDS']))
|
||||
|
||||
app.config['BTCPAY_ENABLED'] = False
|
||||
if app.config['BTCPAY_URL'] is not "":
|
||||
if app.config['BTCPAY_URL'] != "":
|
||||
try:
|
||||
app.config['BTCPAY_CLIENT'] = btcpay.Client(api_uri=app.config['BTCPAY_URL'], pem=app.config['BTCPAY_PRIVATE_KEY'])
|
||||
app.config['BTCPAY_ENABLED'] = True
|
||||
|
@ -199,6 +199,14 @@ def create():
|
||||
capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024)
|
||||
errors = list()
|
||||
|
||||
affordable_vm_sizes = dict()
|
||||
for key, vm_size in vm_sizes.items():
|
||||
# if a user deposits $7.50 and then creates an f1-s vm which costs 7.50 a month,
|
||||
# then they have to delete the vm and re-create it, they will not be able to, they will have to pay again.
|
||||
# so for UX it makes a lot of sense to give a small margin of 25 cents for usability sake
|
||||
if vm_size["dollars_per_month"] <= account_balance+0.25:
|
||||
affordable_vm_sizes[key] = vm_size
|
||||
|
||||
if request.method == "POST":
|
||||
if "csrf-token" not in request.form or request.form['csrf-token'] != session['csrf-token']:
|
||||
return abort(418, f"u want tea")
|
||||
@ -209,6 +217,8 @@ def create():
|
||||
errors.append("Size is required")
|
||||
elif size not in vm_sizes:
|
||||
errors.append(f"Invalid size {size}")
|
||||
elif size not in affordable_vm_sizes:
|
||||
errors.append(f"Your account must have enough credit to run an {size} for 1 month before you will be allowed to create it")
|
||||
|
||||
if not os:
|
||||
errors.append("OS is required")
|
||||
@ -260,13 +270,6 @@ def create():
|
||||
|
||||
return redirect(f"{url_for('console.index')}?created={id}")
|
||||
|
||||
affordable_vm_sizes = dict()
|
||||
for key, vm_size in vm_sizes.items():
|
||||
# if a user deposits $7.50 and then creates an f1-s vm which costs 7.50 a month,
|
||||
# then they have to delete the vm and re-create it, they will not be able to, they will have to pay again.
|
||||
# so for UX it makes a lot of sense to give a small margin of 25 cents for usability sake
|
||||
if vm_size["dollars_per_month"] <= account_balance+0.25:
|
||||
affordable_vm_sizes[key] = vm_size
|
||||
|
||||
for error in errors:
|
||||
flash(error)
|
||||
|
@ -17,6 +17,10 @@ from capsulflask.http_client import HTTPResult
|
||||
from capsulflask.shared import VirtualizationInterface, VirtualMachine, OnlineHost, validate_capsul_id, my_exec_info_message
|
||||
|
||||
class MockHub(VirtualizationInterface):
|
||||
def __init__(self):
|
||||
self.default_network = "public1"
|
||||
self.default_ipv4 = "1.1.1.1"
|
||||
|
||||
def capacity_avaliable(self, additional_ram_bytes):
|
||||
return True
|
||||
|
||||
@ -29,9 +33,9 @@ class MockHub(VirtualizationInterface):
|
||||
{"key_type":"RSA", "content":"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvotgzgEP65JUQ8S8OoNKy1uEEPEAcFetSp7QpONe6hj4wPgyFNgVtdoWdNcU19dX3hpdse0G8OlaMUTnNVuRlbIZXuifXQ2jTtCFUA2mmJ5bF+XjGm3TXKMNGh9PN+wEPUeWd14vZL+QPUMev5LmA8cawPiU5+vVMLid93HRBj118aCJFQxLgrdP48VPfKHFRfCR6TIjg1ii3dH4acdJAvlmJ3GFB6ICT42EmBqskz2MPe0rIFxH8YohCBbAbrbWYcptHt4e48h4UdpZdYOhEdv89GrT8BF2C5cbQ5i9qVpI57bXKrj8hPZU5of48UHLSpXG8mbH0YDiOQOfKX/Mt", "sha256":"ghee6KzRnBJhND2kEUZSaouk7CD6o6z2aAc8GPkV+GQ"},
|
||||
{"key_type":"ECDSA", "content":"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLLgOoATz9R4aS2kk7vWoxX+lshK63t9+5BIHdzZeFE1o+shlcf0Wji8cN/L1+m3bi0uSETZDOAWMP3rHLJj9Hk=", "sha256":"aCYG1aD8cv/TjzJL0bi9jdabMGksdkfa7R8dCGm1yYs"}
|
||||
]""")
|
||||
return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4="1.1.1.1", ssh_host_keys=ssh_host_keys)
|
||||
return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4=self.default_ipv4, ssh_host_keys=ssh_host_keys)
|
||||
|
||||
return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4="1.1.1.1")
|
||||
return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4=self.default_ipv4)
|
||||
|
||||
def list_ids(self) -> list:
|
||||
return get_model().all_non_deleted_vm_ids()
|
||||
@ -40,6 +44,16 @@ class MockHub(VirtualizationInterface):
|
||||
validate_capsul_id(id)
|
||||
current_app.logger.info(f"mock create: {id} for {email}")
|
||||
sleep(1)
|
||||
get_model().create_vm(
|
||||
email=email,
|
||||
id=id,
|
||||
size=size,
|
||||
os=os,
|
||||
host=current_app.config["SPOKE_HOST_ID"],
|
||||
network_name=self.default_network,
|
||||
public_ipv4=self.default_ipv4,
|
||||
ssh_authorized_keys=list(map(lambda x: x["name"], ssh_authorized_keys)),
|
||||
)
|
||||
|
||||
def destroy(self, email: str, id: str):
|
||||
current_app.logger.info(f"mock destroy: {id} for {email}")
|
||||
@ -49,7 +63,6 @@ class MockHub(VirtualizationInterface):
|
||||
|
||||
|
||||
class CapsulFlaskHub(VirtualizationInterface):
|
||||
|
||||
def synchronous_operation(self, hosts: List[OnlineHost], email: str, payload: str) -> List[HTTPResult]:
|
||||
return self.generic_operation(hosts, email, payload, True)[1]
|
||||
|
||||
@ -262,4 +275,3 @@ class CapsulFlaskHub(VirtualizationInterface):
|
||||
|
||||
if not result_status == "success":
|
||||
raise ValueError(f"""failed to {command} vm "{id}" on host "{host.id}" for {email}: {result_json_string}""")
|
||||
|
||||
|
36
docker-compose.yml
Normal file
36
docker-compose.yml
Normal file
@ -0,0 +1,36 @@
|
||||
---
|
||||
version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
image: 3wordchant/capsul-flask:latest
|
||||
build: .
|
||||
volumes:
|
||||
- "./:/app/code"
|
||||
- "../tank:/tank"
|
||||
# - "/var/run/libvirt/libvirt-sock:/var/run/libvirt/libvirt-sock"
|
||||
depends_on:
|
||||
- db
|
||||
ports:
|
||||
- "5000:5000"
|
||||
environment:
|
||||
- "POSTGRES_CONNECTION_PARAMETERS=host=db port=5432 user=capsul password=capsul dbname=capsul"
|
||||
- SPOKE_MODEL=shell-scripts
|
||||
#- FLASK_DEBUG=1
|
||||
- BASE_URL=http://localhost:5000
|
||||
- ADMIN_PANEL_ALLOW_EMAIL_ADDRESSES=3wc.capsul@doesthisthing.work
|
||||
- VIRSH_DEFAULT_CONNECT_URI=qemu:///system
|
||||
# The image uses gunicorn by default, let's override it with Flask's
|
||||
# built-in development server
|
||||
command: ["flask", "run", "-h", "0.0.0.0", "-p", "5000"]
|
||||
db:
|
||||
image: "postgres:9.6.5-alpine"
|
||||
volumes:
|
||||
- "postgres:/var/lib/postgresql/data"
|
||||
environment:
|
||||
POSTGRES_USER: capsul
|
||||
POSTGRES_PASSWORD: capsul
|
||||
POSTGRES_DB: capsul
|
||||
|
||||
volumes:
|
||||
postgres:
|
Reference in New Issue
Block a user