Compare commits
13 Commits
drone
...
8e52e543f9
| Author | SHA1 | Date | |
|---|---|---|---|
| 8e52e543f9 | |||
| 80aeafa013 | |||
| 66d68701c2 | |||
| 94a626e7f1 | |||
| 0ba3b5f037 | |||
| 7544e3c447 | |||
| 96790be6f7 | |||
| 89dcffa6bb | |||
| 4f736f763e | |||
| f84994999a | |||
| 74cd6c6d4b | |||
| 49f981708a | |||
| 54139d6f76 |
12
.drone.yml
12
.drone.yml
@@ -1,20 +1,22 @@
|
|||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: exec
|
type: exec
|
||||||
name: default
|
name: build
|
||||||
|
|
||||||
platform:
|
|
||||||
os: linux
|
|
||||||
arch: amd64
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build
|
- name: build
|
||||||
commands:
|
commands:
|
||||||
- docker-compose -p pycms build
|
- docker-compose -p pycms build
|
||||||
|
|
||||||
- name: test
|
- name: test
|
||||||
commands:
|
commands:
|
||||||
- docker-compose -p pycms up --build --abort-on-container-exit
|
- docker-compose -p pycms up --build --abort-on-container-exit
|
||||||
|
|
||||||
|
- name: push
|
||||||
|
commands:
|
||||||
|
- docker-compose -p pycms push
|
||||||
- name: run
|
- name: run
|
||||||
commands:
|
commands:
|
||||||
|
- docker-compose -p pycms down
|
||||||
- docker-compose -p pycms up -d
|
- docker-compose -p pycms up -d
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,4 +2,7 @@
|
|||||||
host = db
|
host = db
|
||||||
port = 27017
|
port = 27017
|
||||||
name = pycms
|
name = pycms
|
||||||
|
[App]
|
||||||
|
host = 0.0.0.0
|
||||||
|
port = 8080
|
||||||
|
debug = True
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ services:
|
|||||||
build: .
|
build: .
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
volumes:
|
|
||||||
- ./config.ini:/app/config.ini
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
|
volumes:
|
||||||
|
- ./config.ini:/app/config.ini
|
||||||
db:
|
db:
|
||||||
image: mongo
|
image: mongo
|
||||||
tests:
|
tests:
|
||||||
|
|||||||
24
main.py
24
main.py
@@ -44,11 +44,15 @@ class Config:
|
|||||||
self.createConfig(config)
|
self.createConfig(config)
|
||||||
|
|
||||||
db = config['DB']
|
db = config['DB']
|
||||||
|
|
||||||
self.host = db['host']
|
self.host = db['host']
|
||||||
self.port = int(db['port'])
|
self.port = int(db['port'])
|
||||||
self.dbname = db['name']
|
self.dbname = db['name']
|
||||||
|
|
||||||
|
app = config['App']
|
||||||
|
self.apphost = app['host']
|
||||||
|
self.appport = int(app['port'])
|
||||||
|
self.appdebug = bool(app['debug'])
|
||||||
|
|
||||||
def createConfig(self, config):
|
def createConfig(self, config):
|
||||||
"""
|
"""
|
||||||
Create config file
|
Create config file
|
||||||
@@ -59,6 +63,12 @@ class Config:
|
|||||||
db['port'] = '27017'
|
db['port'] = '27017'
|
||||||
db['name'] = 'pycms'
|
db['name'] = 'pycms'
|
||||||
|
|
||||||
|
config['App'] = {}
|
||||||
|
app = config['App']
|
||||||
|
app['port'] = '8080'
|
||||||
|
app['debug'] = 'True'
|
||||||
|
app['host'] = '0.0.0.0'
|
||||||
|
|
||||||
with open('config.ini', 'w') as cfgfile:
|
with open('config.ini', 'w') as cfgfile:
|
||||||
config.write(cfgfile)
|
config.write(cfgfile)
|
||||||
|
|
||||||
@@ -104,6 +114,16 @@ class Back():
|
|||||||
return bool(posts.delete_one({'name': name}).deleted_count)
|
return bool(posts.delete_one({'name': name}).deleted_count)
|
||||||
|
|
||||||
|
|
||||||
|
class Metrics:
|
||||||
|
def alive():
|
||||||
|
return str("alive 1")
|
||||||
|
|
||||||
|
|
||||||
|
@route('/metrics')
|
||||||
|
def metrics():
|
||||||
|
return Metrics.alive()
|
||||||
|
|
||||||
|
|
||||||
@route('/post/<name>')
|
@route('/post/<name>')
|
||||||
def post(name):
|
def post(name):
|
||||||
'''
|
'''
|
||||||
@@ -148,4 +168,4 @@ if __name__ == '__main__':
|
|||||||
print("Configured")
|
print("Configured")
|
||||||
back = Back()
|
back = Back()
|
||||||
posts = cfg.posts
|
posts = cfg.posts
|
||||||
run(host='0.0.0.0', port=8080, reloader=True, debug=True)
|
run(host=cfg.apphost, port=cfg.appport, reloader=cfg.appdebug, debug=cfg.appdebug)
|
||||||
|
|||||||
2
test.sh
2
test.sh
@@ -8,3 +8,5 @@ $curl_cmd $url/post/test && echo ": get Success" || echo ': get fail'
|
|||||||
$curl_cmd -X POST $url/admin/post/test -F 'body=testpage2' && echo ": Update success" || echo ': update fail'
|
$curl_cmd -X POST $url/admin/post/test -F 'body=testpage2' && echo ": Update success" || echo ': update fail'
|
||||||
|
|
||||||
$curl_cmd -X DELETE $url/admin/post/test && echo ": delete success" || echo ': delete fail'
|
$curl_cmd -X DELETE $url/admin/post/test && echo ": delete success" || echo ': delete fail'
|
||||||
|
|
||||||
|
$curl_cmd $url/metrics && echo ": metrics available" || echo ': metrics unavailable'
|
||||||
|
|||||||
Reference in New Issue
Block a user