Skip to content

Commit

Permalink
Merge pull request #941 from ITISFoundation/release-to-staging
Browse files Browse the repository at this point in the history
Release from master to staging for sprint 2019.07.11
  • Loading branch information
pcrespov authored Jul 11, 2019
2 parents 3b3fcf2 + ee660c9 commit 9bf21ac
Show file tree
Hide file tree
Showing 203 changed files with 5,001 additions and 2,038 deletions.
4 changes: 3 additions & 1 deletion .env-devel
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ BF_API_SECRET=none

DOCKER_IMAGE_TAG=latest

MAINTENANCE_PASSWORD=z43

PUBLISHED_HOST_NAME=localhost

POSTGRES_ENDPOINT=postgres:5432
Expand Down Expand Up @@ -41,7 +43,7 @@ S3_SECURE=0
SMTP_HOST=mail.speag.com
SMTP_PORT=25

VENV2=.venv27/
WEBSERVER_LOGIN_REGISTRATION_INVITATION_REQUIRED=1

# python3 -c "from cryptography.fernet import Fernet; print(Fernet.generate_key())"
WEBSERVER_SESSION_SECRET_KEY=REPLACE ME with a key of at least length 32.
5 changes: 5 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
<!-- Please add #issues -->


## How to test

<!-- Please explain how this can be tested. Also state wether this PR needs a full rebuild, database changes, etc. -->


## Checklist

- [ ] I think the code is well written
Expand Down
38 changes: 23 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ PY_FILES := $(strip $(shell find services packages -iname '*.py' \
-not -path "*web/server*"))
TEMPCOMPOSE := $(shell mktemp)

SERVICES_LIST := apihub director sidecar storage webserver
CACHED_SERVICES_LIST := ${SERVICES_LIST} webclient
SERVICES_LIST := apihub director sidecar storage webserver maintenance
CACHED_SERVICES_LIST := apihub director sidecar storage webserver webclient
CLIENT_WEB_OUTPUT:=$(CURDIR)/services/web/client/source-output

export VCS_URL:=$(shell git config --get remote.origin.url)
Expand Down Expand Up @@ -82,7 +82,13 @@ endif
.PHONY: build
# target: build: – Builds all core service images.
build: .env .tmp-webclient-build
${DOCKER_COMPOSE} -f services/docker-compose.yml build --parallel ${SERVICES_LIST};
${DOCKER_COMPOSE} -f services/docker-compose.yml build --parallel ${SERVICES_LIST}

.PHONY: rebuild
# target: build: – Builds all core service images.
rebuild: .env .tmp-webclient-build
${DOCKER_COMPOSE} -f services/docker-compose.yml build --no-cache --parallel ${SERVICES_LIST}


.PHONY: build-devel .tmp-webclient-build
# target: build-devel, rebuild-devel: – Builds images of core services for development.
Expand Down Expand Up @@ -129,12 +135,16 @@ up-devel: up-swarm-devel

up-swarm: .env docker-swarm-check
${DOCKER} swarm init
${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml ;
${DOCKER_COMPOSE} -f services/docker-compose.yml \
-f services/docker-compose-tools.yml \
config > $(TEMPCOMPOSE).tmp-compose.yml ;
${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml ${SWARM_STACK_NAME}

up-swarm-devel: .env docker-swarm-check $(CLIENT_WEB_OUTPUT)
${DOCKER} swarm init
${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml -f services/docker-compose.tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml
${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml \
-f services/docker-compose-tools.yml \
config > $(TEMPCOMPOSE).tmp-compose.yml
${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml ${SWARM_STACK_NAME}

.PHONY: up-webclient-devel
Expand Down Expand Up @@ -167,7 +177,8 @@ pull-cache: .env
.PHONY: build-cache
# target: build-cache – Builds service images and tags them as 'cache'
build-cache:
${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.cache.yml build --parallel apihub director sidecar storage webclient
# WARNING: first all except webserver and then webserver
${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.cache.yml build --parallel apihub director sidecar storage webclient maintenance
${DOCKER} tag ${DOCKER_REGISTRY}/webclient:cache services_webclient:build
${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.cache.yml build webserver

Expand Down Expand Up @@ -201,15 +212,18 @@ endif

# target: push – Pushes images into a registry
push:
${DOCKER_COMPOSE} -f services/docker-compose.yml push ${SERVICES_LIST}
${DOCKER_COMPOSE} -f services/docker-compose.yml \
push ${SERVICES_LIST}

# target: pull – Pulls images from a registry
pull: .env
${DOCKER_COMPOSE} -f services/docker-compose.yml pull ${SERVICES_LIST}
${DOCKER_COMPOSE} -f services/docker-compose.yml \
pull ${SERVICES_LIST}

# target: create-stack-file – use as 'make create-stack-file output_file=stack.yaml'
create-stack-file:
${DOCKER_COMPOSE} -f services/docker-compose.yml config > $(output_file)
${DOCKER_COMPOSE} -f services/docker-compose.yml \
config > $(output_file)

## -------------------------------
# Tools
Expand Down Expand Up @@ -273,12 +287,6 @@ setup-check: .env .vscode/settings.json
.venv/bin/pip3 install pylint autopep8 virtualenv pip-tools
@echo "To activate the venv, execute 'source .venv/bin/activate' or '.venv/Scripts/activate.bat' (WIN)"

.venv27: .venv
# target: .venv27 – Creates a python2.7 virtual environment with dev tools
@python2 --version
.venv/bin/virtualenv --python=python2 .venv27
@echo "To activate the venv27, execute 'source .venv27/bin/activate' or '.venv27/Scripts/activate.bat' (WIN)"


## -------------------------------
# Auxiliary targets.
Expand Down
18 changes: 18 additions & 0 deletions api/specs/storage/v0/components/schemas/file_meta_data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ components:
type: string
user_name:
type: string
file_id:
type: string
raw_file_path:
type: string
display_file_path:
type: string
created_at:
type: string
last_modified:
type: string
file_size:
type: integer
example:
file_uuid: 'simcore-testing/105/1000/3'
location_id: "0"
Expand All @@ -52,3 +64,9 @@ components:
file_name: "example.txt"
user_id: "12"
user_name: "dennis"
file_id: "N:package:e263da07-2d89-45a6-8b0f-61061b913873"
raw_file_path: "Curation/derivatives/subjects/sourcedata/docs/samples/sam_1/sam_1.csv"
display_file_path: "Curation/derivatives/subjects/sourcedata/docs/samples/sam_1/sam_1.csv"
created_at: "2019-06-19T12:29:03.308611Z"
last_modified: "2019-06-19T12:29:03.78852Z"
file_size: 73
20 changes: 0 additions & 20 deletions ops/db/docker-compose.yml

This file was deleted.

159 changes: 0 additions & 159 deletions ops/db/example/README.md

This file was deleted.

Empty file removed ops/db/example/models/__init__.py
Empty file.
9 changes: 0 additions & 9 deletions ops/db/example/models/a.py

This file was deleted.

9 changes: 0 additions & 9 deletions ops/db/example/models/a.py.0

This file was deleted.

10 changes: 0 additions & 10 deletions ops/db/example/models/a.py.1

This file was deleted.

9 changes: 0 additions & 9 deletions ops/db/example/models/b.py

This file was deleted.

9 changes: 0 additions & 9 deletions ops/db/example/models/b.py.0

This file was deleted.

10 changes: 0 additions & 10 deletions ops/db/example/models/b.py.2

This file was deleted.

2 changes: 0 additions & 2 deletions ops/db/example/models/base.py

This file was deleted.

Loading

0 comments on commit 9bf21ac

Please sign in to comment.