Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
grady
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Maximilian Michal
grady
Commits
383ae254
Commit
383ae254
authored
4 years ago
by
Dominik Seeger
Browse files
Options
Downloads
Patches
Plain Diff
changed all postgres versions to 13
parent
52288920
No related branches found
No related tags found
1 merge request
!256
Resolve "Update Postgres to version 13"
Pipeline
#160370
failed
4 years ago
Stage: build
Stage: test
Stage: pages
Stage: staging
Stage: deploy
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
README.md
+16
-16
16 additions, 16 deletions
README.md
docker-compose.yml
+1
-1
1 addition, 1 deletion
docker-compose.yml
with
19 additions
and
19 deletions
.gitlab-ci.yml
+
2
−
2
View file @
383ae254
...
...
@@ -112,7 +112,7 @@ test_pytest:
<<
:
*test_definition_virtualenv
stage
:
test
services
:
-
postgres:
9.6
-
postgres:
13
script
:
-
pytest --cov --ds=grady.settings.test core/tests
artifacts
:
...
...
@@ -152,7 +152,7 @@ test_frontend:
<<
:
*test_definition_frontend
stage
:
test
services
:
-
postgres:
9.6
-
postgres:
13
script
:
-
cp frontend/dist/index.html core/templates
-
python util/format_index.py
...
...
This diff is collapsed.
Click to expand it.
README.md
+
16
−
16
View file @
383ae254
...
...
@@ -62,7 +62,7 @@ installed automatically during the installation process.
To set up a new development instance perform the following steps:
1.
Create a virtual environment with a Python3.6 interpreter and install
1.
Create a virtual environment with a Python3.6 interpreter and install
all relevant dependencies:
```
shell script
...
...
@@ -82,7 +82,7 @@ pipenv shell
4.
Set up a Postgres 9.5 database. If you have docker installed the
easiest way is to just run it in a docker container, like this:
```
shell script
docker run -d --rm --name postgres -p 5432:5432 postgres:
9.5
docker run -d --rm --name postgres -p 5432:5432 postgres:
13
```
...
...
@@ -137,31 +137,31 @@ make teste2e path=functional_tests headless=True
for headless mode (Note: You might need to install additional dependencies).
make teste2e
Notice that this will always issue a complete rebuild of the frontend. If you want to run tests without building the
frontend anew, use
make teste2e-nc
## Production
In order to run the app in production, a server with
[
Docker
](
https://www.docker.com/
)
is needed. To make routing to the
In order to run the app in production, a server with
[
Docker
](
https://www.docker.com/
)
is needed. To make routing to the
respective instances easier, we recommend running
[
traefik
](
https://traefik.io/
)
as a reverse proxy on the server. For easier configuration of the containers
we recommend using
`docker-compose`
. The following guide will assume both these
dependencies are available.
### Setting up a new instance
Simply copy the following
`docker-compose.yml`
onto your production server:
Simply copy the following
`docker-compose.yml`
onto your production server:
```
yaml
version
:
"
3"
services
:
postgres
:
image
:
postgres:
9.6
image
:
postgres:
13
labels
:
traefik.enable
:
"
false"
networks
:
...
...
@@ -198,14 +198,14 @@ networks:
external
:
false
```
and set the
`INSTANCE`
,
`URLPATH`
,
`GRADY_HOST`
variables either directly in the
and set the
`INSTANCE`
,
`URLPATH`
,
`GRADY_HOST`
variables either directly in the
compose file or within an
`.env`
file in the same directory as the
`docker-compose.yml`
(it will be automatically loaded by
`docker-compose`
).
(it will be automatically loaded by
`docker-compose`
).
Login to gwdg gitlab docker registry by entering:
```
commandline
docker login docker.gitlab.gwdg.de
```
Running
Running
```
commandline
docker-compose pull
docker-compose up -d
...
...
@@ -214,17 +214,17 @@ will download the latest postgres and grady images and run them in the backgroun
### Importing exam data
#### Exam data structure
In order to import the exam data it must be in a specific format.
In order to import the exam data it must be in a specific format.
You need the following:
1.
A .json file file containing the output of the converted ILIAS export which is
generated by
[
hektor
](
https://gitlab.gwdg.de/j.michal/hektor
)
2.
A plain text file containing one username per line. A new
**reviewer**
account
2.
A plain text file containing one username per line. A new
**reviewer**
account
will be created with the corresponding username and a randomly
generated password. The passwords are written to a
`.importer_passwords`
file.
This step should not be skipped because a reviewer account is necessary in order
generated password. The passwords are written to a
`.importer_passwords`
file.
This step should not be skipped because a reviewer account is necessary in order
to activate the tutor accounts.
#### Importing exam data
In order to create reviewer accounts, open an interactive shell session in the running container:
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
1
−
1
View file @
383ae254
...
...
@@ -3,7 +3,7 @@ version: '3'
services
:
postgres
:
image
:
postgres:
9.6
image
:
postgres:
13
restart
:
always
networks
:
-
default
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment