diff --git a/CXPBA.xlsx b/CXPBA.xlsx deleted file mode 100644 index f1d0f16..0000000 Binary files a/CXPBA.xlsx and /dev/null differ diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt index bd974b3..da6fd54 100644 --- a/MAINTAINERS.txt +++ b/MAINTAINERS.txt @@ -1,2 +1,2 @@ - HILALY Mohammed-Amine - ELBOUCHTI Alaa \ No newline at end of file + HILALY Mohammed-Amine + ELBOUCHTI Alaa \ No newline at end of file diff --git a/Makefile b/Makefile index 2301c1b..4e2bfa7 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ GITCOMMIT=$(shell git rev-parse HEAD) BUILDDATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') MAJOR=0 MINOR=1 -PATCH=5 +PATCH=6 REVISION=alpha VERSION=v$(MAJOR).$(MINOR).$(PATCH) GOVERSION=1.11 @@ -14,6 +14,7 @@ CWD=$(shell pwd) VPATH=github.com/medtune/beta-platform/internal PROJECTPATH=$(CWD) AUTHORS=El.bouchti.Alaa/Hilaly.Mohammed-Amine +OWNERS=$(AUTHORS) LICENSETYPE=Apache-v2.0 LICENSEURL=https://raw.githubusercontent.com/medtune/beta-platform/master/LICENSE.txt @@ -203,7 +204,7 @@ push-image: gen-k8s: rm -rf deploy/kubernetes/* - kompose convert -f docker-compose.k8s.yml -o deploy/kubernetes + kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated # Test package tests: @@ -337,7 +338,7 @@ kill-capsules: start: ./medtune-beta start \ - -f dev.config.yml \ + -f etc/dev.config.yml \ --syncdb \ --create-users \ --sync-cxpba \ @@ -352,7 +353,7 @@ run: -tags=gocv \ ./cmd/main.go \ start \ - -f dev.config.yml \ + -f etc/dev.config.yml \ --syncdb \ --sync-cxpba \ --create-users \ @@ -375,7 +376,7 @@ clean-gen: clean-demos: - rm -f static/demos/mura/images/*_mn_v2_cam.png + rm -f static/demos/mura/images/*_mn_v2_cam.* rm -f static/demos/mura/images/[^image_*]* rm -f static/demos/chexray/images/[^debug.png][^image_*]* diff --git a/README.md b/README.md index 1228241..8907738 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -# MedTune Platform ~ Beta v0.1.5 +# MedTune Platform ~ Beta v0.1.6 + +/!\ This repository is no longer maintained. MedTune official platform under development [![GitHub license](https://img.shields.io/github/license/medtune/beta-platform.svg)](https://github.com/medtune/beta-platform/blob/iron-master/LICENSE.txt) [![GitHub pull-requests](https://img.shields.io/github/issues-pr/medtune/beta-platform.svg)](https://GitHub.com/medtune/beta-platform/pull/) [![GitHub issues](https://img.shields.io/github/issues/medtune/beta-platform.svg)](https://github.com/medtune/beta-platform/issues) [![GitHub release](https://img.shields.io/github/release/medtune/beta-platform.svg)](https://GitHub.com/medtune/beta-platform/releases) ## Build Status & Coverage -| branch | Status | C.C | C.Q | +| branch | Status | Quality | Coverage | | --- | --- | --- | --- | | Master | [![CircleCI](https://circleci.com/gh/medtune/beta-platform/tree/master.svg?style=svg)](https://circleci.com/gh/medtune/beta-platform/tree/master) | [![CodeFactor](https://www.codefactor.io/repository/github/medtune/beta-platform/badge)](https://www.codefactor.io/repository/github/medtune/beta-platform) | [![codecov](https://codecov.io/gh/medtune/beta-platform/branch/master/graph/badge.svg)](https://codecov.io/gh/medtune/beta-platform) | | Dev | [![CircleCI](https://circleci.com/gh/medtune/beta-platform/tree/dev.svg?style=svg)](https://circleci.com/gh/medtune/beta-platform/tree/dev) | [![CodeFactor](https://www.codefactor.io/repository/github/medtune/beta-platform/badge/dev)](https://www.codefactor.io/repository/github/medtune/beta-platform/overview/dev) | | @@ -17,10 +19,6 @@ - [2. Table of content](#table-of-content) - [3. Overview](#overview) - [4. Concepts](#concepts) - - [1. Platform](#platform) - - [2. Capsules](#capsules) - - [3. Architecture](#architecture) - - [4. Service Discovery](#service-discovery) - [5. Getting started](#getting-started) - [1. Prerequisites](#1-prerequisites) - [2. Configuration](#2-configuration) @@ -41,7 +39,8 @@ - [7. Change log](#changelog) - [8. Contributing](#contributing) - [9. Maintainers](#maintainers) -- [10. License](#License) +- [10. License](#license) +- [11. Todo](#todo) ### Overview @@ -55,16 +54,23 @@ MedTune Beta platform is a _proof of concept_ prototype, focused on serving scal ##### 1 - Prerequisites -To use medtune-beta command line you need a Golang Compiler (Tested on 1.10 and 1.9) +You can compile the binaries your self or use our containers images. + +To compile medtune-beta command line you need a Golang Compiler (Tested on 1.11, 1.10 and 1.9) -To run medtune-beta platform services localy you will need a container engine/orchestrator (like Docker swarm, Kubernetes). +To run medtune-beta platform side services you will need a container engine/orchestrator (like Docker, Kubernetes). ###### Database + Medtune Beta runs next to postgres database (if you want to go beyond signup). +###### Cache + +The application cache users sessions on a Redis cache database. + ###### Capsules -Some of MedTune demos might need to setup some Capsules. [Docker](https://github.com/moby/moby) or [cri-o](https://github.com/kubernetes/cri-o) are enought to make things work, but it requires a lot of handy work. We recommand to use [Swarm](#using-swarm) or [Kubernetes](#kubernetes) for easier setup. +Some of MedTune demos might need to setup their correspendent Capsules (server that perform inference computations). [Docker](https://github.com/moby/moby) or [cri-o](https://github.com/kubernetes/cri-o) are enought to make things work, but it requires a lot of handy work. We recommand to use [Docker compose](#using-docker-compose) or [Kubernetes](#kubernetes) for easier setup. ##### 2 - Configuration @@ -84,32 +90,50 @@ Once capsules are set (or not), you can build MedTune Beta Platform and use it l # Clone project git clone https://github.com/medtune/beta-platform && cd beta-platform +# Fast run +make run + # Compile for current OS/ARCH -# Use GOOS=linux GOARCH=amd if you are compiling for other platforms -go build -o medtune-beta ./cmd/medtune-beta/main.go +# Use GOOS=X GOARCH=Y if you are compiling for other platforms +make release +# make release-cmd +# make release-dev +# make release-debug +# make release-linux # Run server medtune-beta start ``` -###### Using go get (GOGUETTE) +###### Using Docker engine ```shell -# Install package -go get -u github.com/medtune/beta-platform/ -# Run server -medtune-beta run --port=8005 --static=$GOPATH/src/github.com/medtune/beta-platform/static +# build alpine based image +make build-alpine # medtune/beta-platform:prod-alpine + +# build alpine based image for k8s cluster +make build-k8s # medtune/beta-platform:prod-k8s + +# build all images +make build-all + +# Run container +docker run \ + --name=beta-platform \ + -p 8005:8005 \ + medtune/beta-platform:latest ``` -###### Using Docker engine +###### Using go command ```shell -# Build image -docker build -t . medtune-beta:iron +# Install package +go get -u github.com/medtune/beta-platform/... -# Run container -docker run --name=beta-platform -p 8005:8005 medtune/beta-platform:latest +# Run server +export $STATIC_PATH=/dir/files/static +medtune-beta run --port=8005 --static=$STATIC_PATH ``` @@ -117,25 +141,70 @@ docker run --name=beta-platform -p 8005:8005 medtune/beta-platform:latest ```shell # Pull image -docker pull medtune/beta-platform:latest +docker pull medtune/beta-platform:TAG # TAG=prod | prod-alpine | prod-k8s | latest # Run container -docker run --name=beta-platform -p 8005:8005 medtune/beta-platform:latest +docker run --name=beta-platform -p 8005:8005 medtune/beta-platform:TAG ``` +###### Using Docker compose + +```shell +# Create docker swarm +docker-compose up -d +``` ###### Using kubernetes ```shell # Create deployment -kubectl create -f deploy/kubernetes.yaml +kubectl create -f deployments/kubernetes/ + +# Generate kubernetes configuration from docker-compose.yaml +make gen-k8s ``` -###### Using swarm +### Development utils + +###### CICD + +See `.circleci/config.yaml` for more informations about CI/CD setup + +###### Testing ```shell -# Create docker swarm -docker-compose up -d +# Unit tests +make tests + +# racing & coverage tests +make test-cov +``` + +###### Generating kubernetes deployment yaml files + +```shell +# Generate kubernetes configuration from docker-compose.yaml +make gen-k8s +``` + +###### Cleaning demo files + +```shell +# Clean all demos static images +make clean-demos +``` + +###### Scene debuging (capsules) + +```shell +# Makesure your docker engine is connected to medtune hub +make start-scene + +# Stop all capsules containers +make stop-scene + +# Kill all capsules containers +make kill-scene ``` ### Command line @@ -157,3 +226,8 @@ See [MAINTAINERS](MAINTAINERS.txt) ### License Medtune Beta Platform is released under the Apache 2.0 license. See [LICENSE.txt](LICENSE.txt). + +#### TODO + +- End2End Tests +- pprof \ No newline at end of file diff --git a/build/base.Dockerfile b/build/base.Dockerfile index 7ff1ba1..997bba8 100644 --- a/build/base.Dockerfile +++ b/build/base.Dockerfile @@ -16,8 +16,8 @@ ADD Makefile . ADD MAINTAINERS.txt . ADD LICENSE.txt . -ADD config.yml . -ADD CXPBA.xlsx . +ADD etc/config.yml . +ADD assets/CXPBA.xlsx . ADD .codecov.yml . ADD .circleci .circleci diff --git a/build/prod.k8s.Dockerfile b/build/prod.k8s.Dockerfile index f6e9e46..dafaf90 100644 --- a/build/prod.k8s.Dockerfile +++ b/build/prod.k8s.Dockerfile @@ -5,7 +5,7 @@ RUN rm -rf vendor cmd pkg server # Port to expose EXPOSE 8005 -ADD config.k8s.yml . +ADD etc/config.k8s.yml . # please precise -v $CONFIGPATH:/medtune/beta-platform/deploy ENTRYPOINT [ "./medtune-beta",\ @@ -14,5 +14,5 @@ ENTRYPOINT [ "./medtune-beta",\ "--syncdb",\ "--sync-cxpba",\ "--wait",\ - "--create-users"] + "--create-users" ] diff --git a/build/prod.linux.Dockerfile b/build/prod.linux.Dockerfile index d166088..db0bb14 100644 --- a/build/prod.linux.Dockerfile +++ b/build/prod.linux.Dockerfile @@ -5,8 +5,8 @@ WORKDIR /mdtn ADD medtune-beta . ADD static static -ADD config.yml config.yml -ADD CXPBA.xlsx CXPBA.xlsx +ADD etc/config.yml config.yml +ADD assets/CXPBA.xlsx CXPBA.xlsx RUN chmod +x medtune-beta diff --git a/cmd/start/server_cmd.go b/cmd/start/server_cmd.go index 255f436..bc3f777 100644 --- a/cmd/start/server_cmd.go +++ b/cmd/start/server_cmd.go @@ -17,6 +17,7 @@ package start import ( "fmt" "log" + "strings" "time" "github.com/gin-gonic/gin" @@ -48,6 +49,7 @@ var ( cxpbaSync bool cxpbaFile string soft bool + secrets string ) func init() { @@ -63,6 +65,7 @@ func init() { startCmd.Flags().BoolVarP(&wait, "wait", "w", false, "Wait all services to go up") startCmd.Flags().IntVarP(&maxattempts, "wait-attempts", "c", 60, "Wait max attempts") startCmd.Flags().IntVarP(×tamp, "wait-timestamp", "t", 1, "Wait timestamp") + startCmd.Flags().StringVarP(&secrets, "secrets", "u", "", "secrets strings") startCmd.Flags().BoolVarP(&cxpbaSync, "sync-cxpba", "X", false, "Sync CXBPA before start") startCmd.Flags().StringVarP(&cxpbaFile, "cxpba-file", "F", "./CXPBA.xlsx", "CXPBA excel file name") @@ -99,6 +102,11 @@ func runServer() { log.Fatalf("failed to load configuration: %v\n\t%v\n", err, configFile) } + if secrets != "" { + secretsList := strings.Split(secrets, ",") + configuration.Secrets.Signup = secretsList + } + // Init packages if err := initpkg.InitFromConfig(configuration); err != nil && !soft { log.Fatalf("failed to initialize packages: %v\n\t%v\n\t%v\n", err, configFile, configuration) diff --git a/configs/k8s.config.yml b/configs/k8s.config.yml deleted file mode 100644 index b7efd93..0000000 --- a/configs/k8s.config.yml +++ /dev/null @@ -1,119 +0,0 @@ -meta: - name: medtune beta platform - description: medtune beta test - version: v0.1.5 - prod: true - -database: - type: postgres - prod: medtune - test: medtune-test - creds: - host: postgres.default.svc.cluster.local - port: 5432 - user: mdtn - password: mdtn - ssl_mode: 0 - max_idle_conn: 100 - max_open_conn: 100 - -session: - type: redis - address: redis.default.svc.cluster.local:6379 - secret: A0123456789 - password: - database: 0 - -crypto: - algo: SHA256 - salt: MORE-SALT-PLEASE - -public: - static: ./static - prefix: /static - -secrets: - signup: - - supersecret - - siistrasbourg - -create: - users: - - username: admin - email: admin@medtune.org - password: admin - account_level: 1 - account_type: admin - account_status: true - - - username: test - email: test@medtune.org - password: test - account_level: 5 - account_type: default - account_status: true - -capsul: - inception: - name: imagenet-inception-v3 - model: inception - signature: predict_images - version: 1 - address: inception.default.svc.cluster.local:10010 - - mnist: - name: mnist-lenet - model: mnist - signature: predict_images - version: 1 - address: mnist.default.svc.cluster.local:10000 - - mura-irn-v2: - name: mura-inception-resnet-v2 - model: mura_inception_resnet_v2 - signature: predict_images - version: 1 - address: mura-irn-v2.default.svc.cluster.local:10021 - - mura-mn-v2: - name: mura-mobilenet-v2 - model: mura - signature: predict_images - version: 1 - address: mura-mn-v2.default.svc.cluster.local:10020 - - chexray-mn-v2: - name: chexray-mobilenet-v2 - model: chexray - signature: predict_images - version: 1 - address: chexray-mn-v2.default.svc.cluster.local:10030 - - chexray-dn-121: - name: chexray-densenet-121 - model: chexray - signature: process_img - version: 1 - address: chexray-dn-121.default.svc.cluster.local:10031 - -custom_capsul: - mura-mn-v2-cam: - name: mura-mobilenet-v2-cam - model: mura - signature: run_cam - version: 1 - address: mura-mn-v2-cam.default.svc.cluster.local:11020 - - chexray-mn-v2-cam: - name: chexray-mobilenet-v2-cam - model: chexray - signature: run_cam - version: 1 - address: chexray-mn-v2-cam.default.svc.cluster.local:11030 - - chexray-pp-helper: - name: chexray-pp-helper - model: none - signature: process_img - version: 1 - address: chexray-pp.default.svc.cluster.local:12030 \ No newline at end of file diff --git a/configs/local.config.yml b/configs/local.config.yml deleted file mode 100644 index a66ab71..0000000 --- a/configs/local.config.yml +++ /dev/null @@ -1,119 +0,0 @@ -meta: - name: medtune beta platform - description: medtune beta test - version: v0.1.5 - prod: true - -database: - type: postgres - prod: medtune - test: medtune-test - creds: - host: postgres - port: 5432 - user: mdtn - password: mdtn - ssl_mode: 0 - max_idle_conn: 100 - max_open_conn: 100 - -session: - type: redis - address: redis:6379 - secret: A0123456789 - password: - database: 0 - -crypto: - algo: SHA256 - salt: MORE-SALT-PLEASE - -public: - static: ./static - prefix: /static - -secrets: - signup: - - supersecret - - siistrasbourg - -create: - users: - - username: admin - email: admin@medtune.org - password: admin - account_level: 1 - account_type: admin - account_status: true - - - username: test - email: test@medtune.org - password: test - account_level: 5 - account_type: default - account_status: true - -capsul: - inception: - name: imagenet-inception-v3 - model: inception - signature: predict_images - version: 1 - address: inception:10010 - - mnist: - name: mnist-lenet - model: mnist - signature: predict_images - version: 1 - address: mnist:10000 - - mura-irn-v2: - name: mura-inception-resnet-v2 - model: mura_inception_resnet_v2 - signature: predict_images - version: 1 - address: mura-irn-v2:10021 - - mura-mn-v2: - name: mura-mobilenet-v2 - model: mura - signature: predict_images - version: 1 - address: mura-mn-v2:10020 - - chexray-mn-v2: - name: chexray-mobilenet-v2 - model: chexray - signature: predict_images - version: 1 - address: chexray-mn-v2:10030 - - chexray-dn-121: - name: chexray-densenet-121 - model: chexray - signature: process_img - version: 1 - address: chexray-dn-121:10031 - -custom_capsul: - mura-mn-v2-cam: - name: mura-mobilenet-v2-cam - model: mura - signature: run_cam - version: 1 - address: mura-mn-v2-cam:11020 - - chexray-mn-v2-cam: - name: chexray-mobilenet-v2-cam - model: chexray - signature: run_cam - version: 1 - address: chexray-mn-v2-cam:11030 - - chexray-pp-helper: - name: chexray-pp-helper - model: none - signature: process_img - version: 1 - address: chexray-pp:12030 \ No newline at end of file diff --git a/configs/test.ci.config.yml b/configs/test.ci.config.yml deleted file mode 100644 index a66ab71..0000000 --- a/configs/test.ci.config.yml +++ /dev/null @@ -1,119 +0,0 @@ -meta: - name: medtune beta platform - description: medtune beta test - version: v0.1.5 - prod: true - -database: - type: postgres - prod: medtune - test: medtune-test - creds: - host: postgres - port: 5432 - user: mdtn - password: mdtn - ssl_mode: 0 - max_idle_conn: 100 - max_open_conn: 100 - -session: - type: redis - address: redis:6379 - secret: A0123456789 - password: - database: 0 - -crypto: - algo: SHA256 - salt: MORE-SALT-PLEASE - -public: - static: ./static - prefix: /static - -secrets: - signup: - - supersecret - - siistrasbourg - -create: - users: - - username: admin - email: admin@medtune.org - password: admin - account_level: 1 - account_type: admin - account_status: true - - - username: test - email: test@medtune.org - password: test - account_level: 5 - account_type: default - account_status: true - -capsul: - inception: - name: imagenet-inception-v3 - model: inception - signature: predict_images - version: 1 - address: inception:10010 - - mnist: - name: mnist-lenet - model: mnist - signature: predict_images - version: 1 - address: mnist:10000 - - mura-irn-v2: - name: mura-inception-resnet-v2 - model: mura_inception_resnet_v2 - signature: predict_images - version: 1 - address: mura-irn-v2:10021 - - mura-mn-v2: - name: mura-mobilenet-v2 - model: mura - signature: predict_images - version: 1 - address: mura-mn-v2:10020 - - chexray-mn-v2: - name: chexray-mobilenet-v2 - model: chexray - signature: predict_images - version: 1 - address: chexray-mn-v2:10030 - - chexray-dn-121: - name: chexray-densenet-121 - model: chexray - signature: process_img - version: 1 - address: chexray-dn-121:10031 - -custom_capsul: - mura-mn-v2-cam: - name: mura-mobilenet-v2-cam - model: mura - signature: run_cam - version: 1 - address: mura-mn-v2-cam:11020 - - chexray-mn-v2-cam: - name: chexray-mobilenet-v2-cam - model: chexray - signature: run_cam - version: 1 - address: chexray-mn-v2-cam:11030 - - chexray-pp-helper: - name: chexray-pp-helper - model: none - signature: process_img - version: 1 - address: chexray-pp:12030 \ No newline at end of file diff --git a/delphine.yml b/delphine.yml deleted file mode 100644 index c27ed14..0000000 --- a/delphine.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: 1 - -UID: 000000000 -name: platform -engine: docker -storage: hub.docker.com -secrets: - env: $DOCKER_TOKEN - -process: - - package : . - name: beta-platform - version : v0.1.0 - tag-format: $(%name-%version) - - build: - file : Dockerfile - - push: - org: medtune - repo: platform diff --git a/deployements/docker-compose.k8s-gen.yml b/deployments/docker-compose.k8s-gen.yml similarity index 100% rename from deployements/docker-compose.k8s-gen.yml rename to deployments/docker-compose.k8s-gen.yml diff --git a/deployements/docker-compose.yml b/deployments/docker-compose.yml similarity index 97% rename from deployements/docker-compose.yml rename to deployments/docker-compose.yml index 5d166a7..fa0c6e2 100644 --- a/deployements/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -12,7 +12,7 @@ services: command: --appendonly yes platform-app: - image: medtune/beta-platform:v0.1.4 + image: medtune/beta-platform:v0.1.6 ports: - 8006:8005 diff --git a/deployments/k8s-generated/chexray-dn-121-deployment.yaml b/deployments/k8s-generated/chexray-dn-121-deployment.yaml new file mode 100644 index 0000000..21b493b --- /dev/null +++ b/deployments/k8s-generated/chexray-dn-121-deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: chexray-dn-121 + name: chexray-dn-121 +spec: + replicas: 2 + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: chexray-dn-121 + spec: + containers: + - image: medtune/capsul:chexray-dn-121 + name: chexray-dn-121 + ports: + - containerPort: 10031 + resources: {} + restartPolicy: Always +status: {} diff --git a/deployments/k8s-generated/chexray-dn-121-service.yaml b/deployments/k8s-generated/chexray-dn-121-service.yaml new file mode 100644 index 0000000..3562d59 --- /dev/null +++ b/deployments/k8s-generated/chexray-dn-121-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: chexray-dn-121 + name: chexray-dn-121 +spec: + ports: + - name: "10031" + port: 10031 + targetPort: 10031 + selector: + io.kompose.service: chexray-dn-121 +status: + loadBalancer: {} diff --git a/deployements/kubernetes/capsules/chexray-images-persistentvolumeclaim.yaml b/deployments/k8s-generated/chexray-images-persistentvolumeclaim.yaml similarity index 100% rename from deployements/kubernetes/capsules/chexray-images-persistentvolumeclaim.yaml rename to deployments/k8s-generated/chexray-images-persistentvolumeclaim.yaml diff --git a/deployments/k8s-generated/chexray-pp-deployment.yaml b/deployments/k8s-generated/chexray-pp-deployment.yaml new file mode 100644 index 0000000..d3e7e92 --- /dev/null +++ b/deployments/k8s-generated/chexray-pp-deployment.yaml @@ -0,0 +1,35 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: chexray-pp + name: chexray-pp +spec: + replicas: 1 + strategy: + type: Recreate + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: chexray-pp + spec: + containers: + - image: medtune/capsul:chexray-pp-helper + name: chexray-pp + ports: + - containerPort: 12030 + resources: {} + volumeMounts: + - mountPath: /medtune/data + name: chexray-images + restartPolicy: Always + volumes: + - name: chexray-images + persistentVolumeClaim: + claimName: chexray-images +status: {} diff --git a/deployments/k8s-generated/chexray-pp-service.yaml b/deployments/k8s-generated/chexray-pp-service.yaml new file mode 100644 index 0000000..fb366a5 --- /dev/null +++ b/deployments/k8s-generated/chexray-pp-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: chexray-pp + name: chexray-pp +spec: + ports: + - name: "12030" + port: 12030 + targetPort: 12030 + selector: + io.kompose.service: chexray-pp +status: + loadBalancer: {} diff --git a/deployments/k8s-generated/inception-deployment.yaml b/deployments/k8s-generated/inception-deployment.yaml new file mode 100644 index 0000000..17bd957 --- /dev/null +++ b/deployments/k8s-generated/inception-deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: inception + name: inception +spec: + replicas: 2 + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: inception + spec: + containers: + - image: medtune/capsul:inception + name: inception + ports: + - containerPort: 10010 + resources: {} + restartPolicy: Always +status: {} diff --git a/deployments/k8s-generated/inception-service.yaml b/deployments/k8s-generated/inception-service.yaml new file mode 100644 index 0000000..fd3517c --- /dev/null +++ b/deployments/k8s-generated/inception-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: inception + name: inception +spec: + ports: + - name: "10010" + port: 10010 + targetPort: 10010 + selector: + io.kompose.service: inception +status: + loadBalancer: {} diff --git a/deployments/k8s-generated/mnist-deployment.yaml b/deployments/k8s-generated/mnist-deployment.yaml new file mode 100644 index 0000000..7b23292 --- /dev/null +++ b/deployments/k8s-generated/mnist-deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: mnist + name: mnist +spec: + replicas: 2 + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: mnist + spec: + containers: + - image: medtune/capsul:mnist + name: mnist + ports: + - containerPort: 10000 + resources: {} + restartPolicy: Always +status: {} diff --git a/deployments/k8s-generated/mnist-service.yaml b/deployments/k8s-generated/mnist-service.yaml new file mode 100644 index 0000000..ea228b9 --- /dev/null +++ b/deployments/k8s-generated/mnist-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: mnist + name: mnist +spec: + ports: + - name: "10000" + port: 10000 + targetPort: 10000 + selector: + io.kompose.service: mnist +status: + loadBalancer: {} diff --git a/deployements/kubernetes/capsules/mura-images-persistentvolumeclaim.yaml b/deployments/k8s-generated/mura-images-persistentvolumeclaim.yaml similarity index 100% rename from deployements/kubernetes/capsules/mura-images-persistentvolumeclaim.yaml rename to deployments/k8s-generated/mura-images-persistentvolumeclaim.yaml diff --git a/deployments/k8s-generated/mura-irn-v2-deployment.yaml b/deployments/k8s-generated/mura-irn-v2-deployment.yaml new file mode 100644 index 0000000..020de49 --- /dev/null +++ b/deployments/k8s-generated/mura-irn-v2-deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: mura-irn-v2 + name: mura-irn-v2 +spec: + replicas: 2 + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: mura-irn-v2 + spec: + containers: + - image: medtune/capsul:mura-irn-v2 + name: mura-irn-v2 + ports: + - containerPort: 10021 + resources: {} + restartPolicy: Always +status: {} diff --git a/deployments/k8s-generated/mura-irn-v2-service.yaml b/deployments/k8s-generated/mura-irn-v2-service.yaml new file mode 100644 index 0000000..a23792c --- /dev/null +++ b/deployments/k8s-generated/mura-irn-v2-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: mura-irn-v2 + name: mura-irn-v2 +spec: + ports: + - name: "10021" + port: 10021 + targetPort: 10021 + selector: + io.kompose.service: mura-irn-v2 +status: + loadBalancer: {} diff --git a/deployments/k8s-generated/mura-mn-v2-cam-deployment.yaml b/deployments/k8s-generated/mura-mn-v2-cam-deployment.yaml new file mode 100644 index 0000000..02c4c49 --- /dev/null +++ b/deployments/k8s-generated/mura-mn-v2-cam-deployment.yaml @@ -0,0 +1,35 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: mura-mn-v2-cam + name: mura-mn-v2-cam +spec: + replicas: 1 + strategy: + type: Recreate + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: mura-mn-v2-cam + spec: + containers: + - image: medtune/capsul:mura-mn-v2-cam + name: mura-mn-v2-cam + ports: + - containerPort: 11020 + resources: {} + volumeMounts: + - mountPath: /medtune/data + name: mura-images + restartPolicy: Always + volumes: + - name: mura-images + persistentVolumeClaim: + claimName: mura-images +status: {} diff --git a/deployments/k8s-generated/mura-mn-v2-cam-service.yaml b/deployments/k8s-generated/mura-mn-v2-cam-service.yaml new file mode 100644 index 0000000..51b7339 --- /dev/null +++ b/deployments/k8s-generated/mura-mn-v2-cam-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: mura-mn-v2-cam + name: mura-mn-v2-cam +spec: + ports: + - name: "11020" + port: 11020 + targetPort: 11020 + selector: + io.kompose.service: mura-mn-v2-cam +status: + loadBalancer: {} diff --git a/deployments/k8s-generated/mura-mn-v2-deployment.yaml b/deployments/k8s-generated/mura-mn-v2-deployment.yaml new file mode 100644 index 0000000..3705ec7 --- /dev/null +++ b/deployments/k8s-generated/mura-mn-v2-deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: mura-mn-v2 + name: mura-mn-v2 +spec: + replicas: 2 + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: mura-mn-v2 + spec: + containers: + - image: medtune/capsul:mura-mn-v2 + name: mura-mn-v2 + ports: + - containerPort: 10020 + resources: {} + restartPolicy: Always +status: {} diff --git a/deployments/k8s-generated/mura-mn-v2-service.yaml b/deployments/k8s-generated/mura-mn-v2-service.yaml new file mode 100644 index 0000000..71ee2cc --- /dev/null +++ b/deployments/k8s-generated/mura-mn-v2-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: mura-mn-v2 + name: mura-mn-v2 +spec: + ports: + - name: "10020" + port: 10020 + targetPort: 10020 + selector: + io.kompose.service: mura-mn-v2 +status: + loadBalancer: {} diff --git a/deployments/k8s-generated/platform-app-deployment.yaml b/deployments/k8s-generated/platform-app-deployment.yaml new file mode 100644 index 0000000..9f329ae --- /dev/null +++ b/deployments/k8s-generated/platform-app-deployment.yaml @@ -0,0 +1,41 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.service.type: LoadBalancer + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: platform-app + name: platform-app +spec: + replicas: 10 + strategy: + type: Recreate + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: platform-app + spec: + containers: + - image: medtune/beta-platform:k8s + name: platform-app + ports: + - containerPort: 8005 + resources: {} + volumeMounts: + - mountPath: /go/src/github.com/medtune/beta-platform/static/demos/mura/images + name: mura-images + - mountPath: /go/src/github.com/medtune/beta-platform/static/demos/chexray/images + name: chexray-images + restartPolicy: Always + volumes: + - name: mura-images + persistentVolumeClaim: + claimName: mura-images + - name: chexray-images + persistentVolumeClaim: + claimName: chexray-images +status: {} diff --git a/deployments/k8s-generated/platform-app-service.yaml b/deployments/k8s-generated/platform-app-service.yaml new file mode 100644 index 0000000..b02c67b --- /dev/null +++ b/deployments/k8s-generated/platform-app-service.yaml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.service.type: LoadBalancer + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: platform-app + name: platform-app +spec: + ports: + - name: "8005" + port: 8005 + targetPort: 8005 + selector: + io.kompose.service: platform-app + type: LoadBalancer +status: + loadBalancer: {} diff --git a/deployments/k8s-generated/postgres-deployment.yaml b/deployments/k8s-generated/postgres-deployment.yaml new file mode 100644 index 0000000..6d700c0 --- /dev/null +++ b/deployments/k8s-generated/postgres-deployment.yaml @@ -0,0 +1,34 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: postgres + name: postgres +spec: + replicas: 1 + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: postgres + spec: + containers: + - env: + - name: POSTGRES_DB + value: medtune + - name: POSTGRES_PASSWORD + value: mdtn + - name: POSTGRES_USER + value: mdtn + image: postgres:latest + name: postgres + ports: + - containerPort: 5432 + resources: {} + restartPolicy: Always +status: {} diff --git a/deployments/k8s-generated/postgres-service.yaml b/deployments/k8s-generated/postgres-service.yaml new file mode 100644 index 0000000..b43adf2 --- /dev/null +++ b/deployments/k8s-generated/postgres-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: postgres + name: postgres +spec: + ports: + - name: "5432" + port: 5432 + targetPort: 5432 + selector: + io.kompose.service: postgres +status: + loadBalancer: {} diff --git a/deployments/k8s-generated/redis-deployment.yaml b/deployments/k8s-generated/redis-deployment.yaml new file mode 100644 index 0000000..3710fcd --- /dev/null +++ b/deployments/k8s-generated/redis-deployment.yaml @@ -0,0 +1,30 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: redis + name: redis +spec: + replicas: 1 + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: redis + spec: + containers: + - args: + - --appendonly + - "yes" + image: redis:latest + name: redis + ports: + - containerPort: 6379 + resources: {} + restartPolicy: Always +status: {} diff --git a/deployments/k8s-generated/redis-service.yaml b/deployments/k8s-generated/redis-service.yaml new file mode 100644 index 0000000..813c2d9 --- /dev/null +++ b/deployments/k8s-generated/redis-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -f deployments/docker-compose.k8s-gen.yml -o deployments/k8s-generated + kompose.version: 1.16.0 () + creationTimestamp: null + labels: + io.kompose.service: redis + name: redis +spec: + ports: + - name: "6379" + port: 6379 + targetPort: 6379 + selector: + io.kompose.service: redis +status: + loadBalancer: {} diff --git a/deployements/kubernetes/Makefile b/deployments/k8s/Makefile similarity index 100% rename from deployements/kubernetes/Makefile rename to deployments/k8s/Makefile diff --git a/deployements/kubernetes/capsules/chexray-dn-121-deployment.yaml b/deployments/k8s/capsules/chexray-dn-121-deployment.yaml similarity index 100% rename from deployements/kubernetes/capsules/chexray-dn-121-deployment.yaml rename to deployments/k8s/capsules/chexray-dn-121-deployment.yaml diff --git a/deployements/kubernetes/capsules/chexray-dn-121-service.yaml b/deployments/k8s/capsules/chexray-dn-121-service.yaml similarity index 100% rename from deployements/kubernetes/capsules/chexray-dn-121-service.yaml rename to deployments/k8s/capsules/chexray-dn-121-service.yaml diff --git a/deployments/k8s/capsules/chexray-images-persistentvolumeclaim.yaml b/deployments/k8s/capsules/chexray-images-persistentvolumeclaim.yaml new file mode 100644 index 0000000..4e34e1c --- /dev/null +++ b/deployments/k8s/capsules/chexray-images-persistentvolumeclaim.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + labels: + io.kompose.service: chexray-images + name: chexray-images +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi +status: {} diff --git a/deployements/kubernetes/capsules/chexray-pp-deployment.yaml b/deployments/k8s/capsules/chexray-pp-deployment.yaml similarity index 100% rename from deployements/kubernetes/capsules/chexray-pp-deployment.yaml rename to deployments/k8s/capsules/chexray-pp-deployment.yaml diff --git a/deployements/kubernetes/capsules/chexray-pp-service.yaml b/deployments/k8s/capsules/chexray-pp-service.yaml similarity index 100% rename from deployements/kubernetes/capsules/chexray-pp-service.yaml rename to deployments/k8s/capsules/chexray-pp-service.yaml diff --git a/deployements/kubernetes/capsules/inception-deployment.yaml b/deployments/k8s/capsules/inception-deployment.yaml similarity index 100% rename from deployements/kubernetes/capsules/inception-deployment.yaml rename to deployments/k8s/capsules/inception-deployment.yaml diff --git a/deployements/kubernetes/capsules/inception-service.yaml b/deployments/k8s/capsules/inception-service.yaml similarity index 100% rename from deployements/kubernetes/capsules/inception-service.yaml rename to deployments/k8s/capsules/inception-service.yaml diff --git a/deployements/kubernetes/capsules/mnist-deployment.yaml b/deployments/k8s/capsules/mnist-deployment.yaml similarity index 100% rename from deployements/kubernetes/capsules/mnist-deployment.yaml rename to deployments/k8s/capsules/mnist-deployment.yaml diff --git a/deployements/kubernetes/capsules/mnist-service.yaml b/deployments/k8s/capsules/mnist-service.yaml similarity index 100% rename from deployements/kubernetes/capsules/mnist-service.yaml rename to deployments/k8s/capsules/mnist-service.yaml diff --git a/deployments/k8s/capsules/mura-images-persistentvolumeclaim.yaml b/deployments/k8s/capsules/mura-images-persistentvolumeclaim.yaml new file mode 100644 index 0000000..b03fe07 --- /dev/null +++ b/deployments/k8s/capsules/mura-images-persistentvolumeclaim.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + labels: + io.kompose.service: mura-images + name: mura-images +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi +status: {} diff --git a/deployements/kubernetes/capsules/mura-irn-v2-deployment.yaml b/deployments/k8s/capsules/mura-irn-v2-deployment.yaml similarity index 100% rename from deployements/kubernetes/capsules/mura-irn-v2-deployment.yaml rename to deployments/k8s/capsules/mura-irn-v2-deployment.yaml diff --git a/deployements/kubernetes/capsules/mura-irn-v2-service.yaml b/deployments/k8s/capsules/mura-irn-v2-service.yaml similarity index 100% rename from deployements/kubernetes/capsules/mura-irn-v2-service.yaml rename to deployments/k8s/capsules/mura-irn-v2-service.yaml diff --git a/deployements/kubernetes/capsules/mura-mn-v2-cam-deployment.yaml b/deployments/k8s/capsules/mura-mn-v2-cam-deployment.yaml similarity index 100% rename from deployements/kubernetes/capsules/mura-mn-v2-cam-deployment.yaml rename to deployments/k8s/capsules/mura-mn-v2-cam-deployment.yaml diff --git a/deployements/kubernetes/capsules/mura-mn-v2-cam-service.yaml b/deployments/k8s/capsules/mura-mn-v2-cam-service.yaml similarity index 100% rename from deployements/kubernetes/capsules/mura-mn-v2-cam-service.yaml rename to deployments/k8s/capsules/mura-mn-v2-cam-service.yaml diff --git a/deployements/kubernetes/capsules/mura-mn-v2-deployment.yaml b/deployments/k8s/capsules/mura-mn-v2-deployment.yaml similarity index 100% rename from deployements/kubernetes/capsules/mura-mn-v2-deployment.yaml rename to deployments/k8s/capsules/mura-mn-v2-deployment.yaml diff --git a/deployements/kubernetes/capsules/mura-mn-v2-service.yaml b/deployments/k8s/capsules/mura-mn-v2-service.yaml similarity index 100% rename from deployements/kubernetes/capsules/mura-mn-v2-service.yaml rename to deployments/k8s/capsules/mura-mn-v2-service.yaml diff --git a/deployements/kubernetes/namespace.yaml b/deployments/k8s/namespace.yaml similarity index 100% rename from deployements/kubernetes/namespace.yaml rename to deployments/k8s/namespace.yaml diff --git a/deployements/kubernetes/platform/platform-app-deployment.yaml b/deployments/k8s/platform/platform-app-deployment.yaml similarity index 100% rename from deployements/kubernetes/platform/platform-app-deployment.yaml rename to deployments/k8s/platform/platform-app-deployment.yaml diff --git a/deployements/kubernetes/platform/platform-app-service.yaml b/deployments/k8s/platform/platform-app-service.yaml similarity index 100% rename from deployements/kubernetes/platform/platform-app-service.yaml rename to deployments/k8s/platform/platform-app-service.yaml diff --git a/deployements/kubernetes/postgres/postgres-deployment.yaml b/deployments/k8s/postgres/postgres-deployment.yaml similarity index 100% rename from deployements/kubernetes/postgres/postgres-deployment.yaml rename to deployments/k8s/postgres/postgres-deployment.yaml diff --git a/deployements/kubernetes/postgres/postgres-service.yaml b/deployments/k8s/postgres/postgres-service.yaml similarity index 100% rename from deployements/kubernetes/postgres/postgres-service.yaml rename to deployments/k8s/postgres/postgres-service.yaml diff --git a/deployements/kubernetes/redis/redis-deployment.yaml b/deployments/k8s/redis/redis-deployment.yaml similarity index 100% rename from deployements/kubernetes/redis/redis-deployment.yaml rename to deployments/k8s/redis/redis-deployment.yaml diff --git a/deployements/kubernetes/redis/redis-service.yaml b/deployments/k8s/redis/redis-service.yaml similarity index 100% rename from deployements/kubernetes/redis/redis-service.yaml rename to deployments/k8s/redis/redis-service.yaml diff --git a/docker-compose.yml b/docker-compose.yml index 5d166a7..7d62fe4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,16 @@ services: command: --appendonly yes platform-app: - image: medtune/beta-platform:v0.1.4 + image: medtune/beta-platform:v0.1.6 + entrypoint: + - ./medtune-beta + - start + - --wait + - --sync-cxpba + - --syncdb + - --create-users + - --secrets=TEST,TEST + ports: - 8006:8005 diff --git a/configs/test.config.yml b/etc/config.dev.yml similarity index 79% rename from configs/test.config.yml rename to etc/config.dev.yml index a66ab71..5998bbe 100644 --- a/configs/test.config.yml +++ b/etc/config.dev.yml @@ -1,7 +1,7 @@ meta: name: medtune beta platform description: medtune beta test - version: v0.1.5 + version: v0.1.6 prod: true database: @@ -9,17 +9,21 @@ database: prod: medtune test: medtune-test creds: - host: postgres + host: localhost port: 5432 - user: mdtn - password: mdtn + user: root + password: root ssl_mode: 0 max_idle_conn: 100 max_open_conn: 100 session: + #type: cookie + #random: true + #name: default-session + #secret: A0123456789 type: redis - address: redis:6379 + address: localhost:6379 secret: A0123456789 password: database: 0 @@ -29,7 +33,7 @@ crypto: salt: MORE-SALT-PLEASE public: - static: ./static + static: static prefix: /static secrets: @@ -59,42 +63,42 @@ capsul: model: inception signature: predict_images version: 1 - address: inception:10010 + address: localhost:10010 mnist: name: mnist-lenet model: mnist signature: predict_images version: 1 - address: mnist:10000 + address: localhost:10000 mura-irn-v2: name: mura-inception-resnet-v2 model: mura_inception_resnet_v2 signature: predict_images version: 1 - address: mura-irn-v2:10021 + address: localhost:10021 mura-mn-v2: name: mura-mobilenet-v2 model: mura signature: predict_images version: 1 - address: mura-mn-v2:10020 + address: localhost:10020 chexray-mn-v2: name: chexray-mobilenet-v2 model: chexray signature: predict_images version: 1 - address: chexray-mn-v2:10030 + address: localhost:10030 chexray-dn-121: name: chexray-densenet-121 model: chexray signature: process_img version: 1 - address: chexray-dn-121:10031 + address: localhost:10031 custom_capsul: mura-mn-v2-cam: @@ -102,18 +106,18 @@ custom_capsul: model: mura signature: run_cam version: 1 - address: mura-mn-v2-cam:11020 + address: localhost:11020 chexray-mn-v2-cam: name: chexray-mobilenet-v2-cam model: chexray signature: run_cam version: 1 - address: chexray-mn-v2-cam:11030 + address: localhost:11030 chexray-pp-helper: name: chexray-pp-helper model: none signature: process_img version: 1 - address: chexray-pp:12030 \ No newline at end of file + address: localhost:12030 \ No newline at end of file diff --git a/config.k8s.yml b/etc/config.k8s.yml similarity index 99% rename from config.k8s.yml rename to etc/config.k8s.yml index b7efd93..798dc3d 100644 --- a/config.k8s.yml +++ b/etc/config.k8s.yml @@ -1,7 +1,7 @@ meta: name: medtune beta platform description: medtune beta test - version: v0.1.5 + version: v0.1.6 prod: true database: diff --git a/config.yml b/etc/config.yml similarity index 89% rename from config.yml rename to etc/config.yml index a66ab71..28e275e 100644 --- a/config.yml +++ b/etc/config.yml @@ -1,7 +1,7 @@ meta: name: medtune beta platform description: medtune beta test - version: v0.1.5 + version: v0.1.6 prod: true database: @@ -34,25 +34,16 @@ public: secrets: signup: - - supersecret - - siistrasbourg create: users: - username: admin email: admin@medtune.org - password: admin + password: SUPERSECRET account_level: 1 account_type: admin account_status: true - - username: test - email: test@medtune.org - password: test - account_level: 5 - account_type: default - account_status: true - capsul: inception: name: imagenet-inception-v3 diff --git a/go.mod b/go.mod index 26e5b53..f6ce43d 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 // indirect github.com/gin-gonic/gin v1.3.0 github.com/go-sql-driver/mysql v1.4.0 // indirect + github.com/go-xorm/core v0.0.0-20180322150003-0177c08cee88 github.com/go-xorm/xorm v0.7.0 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/protobuf v1.2.0 // indirect diff --git a/hack/version-bump/version-bump.go b/hack/version-bump/version-bump.go index a212f69..900440b 100644 --- a/hack/version-bump/version-bump.go +++ b/hack/version-bump/version-bump.go @@ -44,7 +44,6 @@ var Cmd = &cobra.Command{ Use: "bump-version", Short: "tool to bump versions accross project confs & packages", Run: func(cmd *cobra.Command, args []string) { - if configs != "" { files := strings.Split(configs, ",") for _, file := range files { @@ -65,7 +64,6 @@ var Cmd = &cobra.Command{ updateVersion(file, "readme") } } - }, } diff --git a/internal/initpkg/init.go b/internal/initpkg/init.go index 3e9b273..d8ad426 100644 --- a/internal/initpkg/init.go +++ b/internal/initpkg/init.go @@ -3,13 +3,9 @@ package initpkg import ( "fmt" "log" - "os" "time" - "github.com/go-xorm/xorm" - "github.com/gin-contrib/sessions/redis" - "github.com/go-xorm/core" tfsclient "github.com/medtune/capsul/pkg/tfs-client" "github.com/medtune/go-utils/random" @@ -140,9 +136,9 @@ func initStore(c *config.Database, prod bool) error { return err } - engine.ShowSQL(true) - engine.Logger().SetLevel(core.LOG_DEBUG) - engine.SetLogger(xorm.NewSimpleLogger(os.Stdout)) + //engine.ShowSQL(true) + //engine.Logger().SetLevel(core.LOG_DEBUG) + //engine.SetLogger(xorm.NewSimpleLogger(os.Stdout)) store.Agent = engine return nil diff --git a/internal/tmpl/private/demos/polynomial_regression.go b/internal/tmpl/private/demos/polynomial_regression.go index 50102fc..82a1ba1 100644 --- a/internal/tmpl/private/demos/polynomial_regression.go +++ b/internal/tmpl/private/demos/polynomial_regression.go @@ -22,8 +22,8 @@ const PolynomialRegression = `{{define "content"}}
- - + +
diff --git a/internal/tmpl/shared/base.go b/internal/tmpl/shared/base.go index fb68334..e04986e 100644 --- a/internal/tmpl/shared/base.go +++ b/internal/tmpl/shared/base.go @@ -11,7 +11,7 @@ const Base = `{{define "base"}} {{ .PageTitle }} - + {{template "srcheader" .}} diff --git a/internal/tmpl/shared/base_dashboard.go b/internal/tmpl/shared/base_dashboard.go index 3f52c00..43f157f 100644 --- a/internal/tmpl/shared/base_dashboard.go +++ b/internal/tmpl/shared/base_dashboard.go @@ -12,7 +12,7 @@ const BaseDashboard = `{{define "base"}} - + diff --git a/static/demos/chexray/images/01234.jpeg b/static/demos/chexray/images/01234.jpeg deleted file mode 100644 index 83da21c..0000000 Binary files a/static/demos/chexray/images/01234.jpeg and /dev/null differ diff --git a/static/demos/chexray/images/23456.jpg b/static/demos/chexray/images/23456.jpg deleted file mode 100644 index d78ec93..0000000 Binary files a/static/demos/chexray/images/23456.jpg and /dev/null differ diff --git a/static/demos/mura/images/image_0_mn_v2_cam.png b/static/demos/mura/images/image_0_mn_v2_cam.png deleted file mode 100644 index 4c854fa..0000000 Binary files a/static/demos/mura/images/image_0_mn_v2_cam.png and /dev/null differ diff --git a/static/demos/mura/images/image_10_mn_v2_cam.jpg b/static/demos/mura/images/image_10_mn_v2_cam.jpg deleted file mode 100644 index f8b788b..0000000 Binary files a/static/demos/mura/images/image_10_mn_v2_cam.jpg and /dev/null differ diff --git a/static/demos/mura/images/image_1_mn_v2_cam.png b/static/demos/mura/images/image_1_mn_v2_cam.png deleted file mode 100644 index 9b0ba60..0000000 Binary files a/static/demos/mura/images/image_1_mn_v2_cam.png and /dev/null differ diff --git a/static/demos/mura/images/image_2_mn_v2_cam.png b/static/demos/mura/images/image_2_mn_v2_cam.png deleted file mode 100644 index 4bbea62..0000000 Binary files a/static/demos/mura/images/image_2_mn_v2_cam.png and /dev/null differ diff --git a/static/demos/mura/images/image_3_mn_v2_cam.png b/static/demos/mura/images/image_3_mn_v2_cam.png deleted file mode 100644 index 13d8498..0000000 Binary files a/static/demos/mura/images/image_3_mn_v2_cam.png and /dev/null differ diff --git a/static/demos/mura/images/image_7_mn_v2_cam.jpg b/static/demos/mura/images/image_7_mn_v2_cam.jpg deleted file mode 100644 index a2a449b..0000000 Binary files a/static/demos/mura/images/image_7_mn_v2_cam.jpg and /dev/null differ diff --git a/static/demos/mura/images/image_8_mn_v2_cam.jpg b/static/demos/mura/images/image_8_mn_v2_cam.jpg deleted file mode 100644 index 18c85ff..0000000 Binary files a/static/demos/mura/images/image_8_mn_v2_cam.jpg and /dev/null differ