Commit 248e42e6 authored by unknown's avatar unknown

final changes

parent 0b583ff3
Pipeline #3287 passed with stage
in 39 seconds
......@@ -6,11 +6,11 @@
# build and run development version
dev:
docker-compose -f docker-compose.dev.yml up --build
docker-compose -f docker-compose.dev.yml up --build --remove-orphans
# build and run production version
prod:
docker-compose -f docker-compose.prod.yml up --build
docker-compose -f docker-compose.prod.yml up --build --remove-orphans
# build development version
dev-build:
......@@ -43,8 +43,9 @@ prune:
test:
docker-compose -f docker-compose.test.yml up --build
# --abort-on-container-exit \
# --exit-code-from test-app
--abort-on-container-exit \
--exit-code-from pytest-runner \
&& docker volume rm test-volume
# docker-compose up && docker-compose rm -fsv # removes all stopped containers
test-prod:
......
......@@ -3,9 +3,10 @@ WORKDIR /backend
COPY . /backend
RUN groupadd -r uwsgi && useradd -r -g uwsgi uwsgi
#RUN chown uwsgi:uwsgi uploaded_files
RUN pip3 install -r requirements.txt
RUN chmod 777 uploaded_files
RUN chmod -R 777 uploaded_files
USER uwsgi
......
......@@ -11,7 +11,11 @@ USER uwsgi
ARG PORT
ARG PROTOCOL
ENV PROTOCOL ${PROTOCOL}
ARG VERSION
ENV PORT ${PORT}
ENV PROTOCOL ${PROTOCOL}
ENV VERSION ${VERSION}
CMD sh prestart.sh && uwsgi conf/uwsgi.ini
......@@ -3,7 +3,7 @@ hook-master-start = unix_signal:15 gracefully_kill_them_all
need-app = true
die-on-term = true
http-socket = :3001
chmod-master = 775
chmod-master = 777
master = true
processes = 4
threads = 2
......
......@@ -13,7 +13,7 @@ config['uwsgi'] = {
'need-app': 'true',
'die-on-term': 'true',
'http-socket': port,
'chmod-master': '775',
'chmod-master': '777',
'master': 'true',
'processes': '4',
'threads': '2',
......
......@@ -11,7 +11,7 @@ primary uses HTTP protocol.
Root folder contains all <b>docker-compose</b> configuration files in YML, environment configuration,
gitlab pipeline script and Makefile.
### Description
### Configuration
In default, frontend container runs on ```http://localhost:8080```. Backend service runs
on ```http://localhost:3001```. Changing ports or hostname is possible via
......@@ -23,6 +23,7 @@ container, which will reverse proxy all request that are destined to backend.
For example, request ```http://localhost:8080/api/v1/tools``` will be redirected to backend service
and in response you will get all supported report parsing tools.
### Project description
As you can see below, root folder contains also <b>tests</b> folder. Tests are separated into
two categories.
......
......@@ -63,7 +63,7 @@ services:
- "3001"
volumes:
- ./backend:/backend
- data-volume:/backend/uploaded_files
- test-volume:/backend/uploaded_files:Z
environment:
- VERSION=${VERSION}
- PORT=${BACKEND_PORT}
......@@ -87,4 +87,4 @@ services:
privileged: true
volumes:
data-volume:
test-volume:
......@@ -24,11 +24,11 @@
<q-tooltip
:offset="[10, 10]"
anchor="center left"
content-class="bg-accent"
content-style="font-size: 16px"
self="center right"
transition-hide="jump-left"
transition-show="jump-left"
content-class="bg-grey-3 text-black"
:content-style="$q.dark.isActive ? 'font-size: 13px;' : 'font-size: 13px; border: 1px solid black'"
>
Edit
</q-tooltip>
......
......@@ -28,5 +28,4 @@ def step_impl(context):
@then("'Report' title is shown")
def step_impl(context):
title = context.driver.find_element_by_xpath('//*[@id="rep"]/div[1]/div[1]').text
assert 'Report' in title
\ No newline at end of file
......@@ -7,7 +7,11 @@ from behave import *
@when("user clicks on first tab")
def step_impl(context):
context.driver.find_element_by_xpath('//*[@id="source"]/div/div/div[1]/div/div[1]').click()
try:
context.driver.find_element_by_xpath('//*[@id="source"]/div/div/div[1]/div/div[1]').click()
except Exception:
context.driver.find_element_by_xpath('//*[@id="source"]/div/div/div[1]/div/div[2]').click()
# tab 'other.py' is opened
@then("source code is displayed")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment