Skip to content

Commit 42745bf

Browse files
Rework attachments and test screenshots storage (#1889)
* Rework attachments and test screenshots storage * Remove test suffix to database
1 parent 9512871 commit 42745bf

13 files changed

Lines changed: 11 additions & 27 deletions

File tree

database/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

database/populate/create-databases.sql

Lines changed: 0 additions & 2 deletions
This file was deleted.

docker-compose.test-parallel-base.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ services:
2727
source: ./scripts
2828
target: /opt
2929
- type: bind
30-
source: ./database/storage
30+
source: ./docker/storage
3131
target: /var/storage
3232
read_only: false
3333

@@ -42,11 +42,11 @@ services:
4242
target: /var/lib/mysql
4343
- type: bind
4444
read_only: true
45-
source: ./database/configuration
45+
source: ./docker/database/configuration
4646
target: /etc/mysql/conf.d
4747
- type: bind
4848
read_only: true
49-
source: ./database/populate
49+
source: ./docker/database/populate
5050
target: /docker-entrypoint-initdb.d
5151

5252
volumes:

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ services:
3636
target: /opt
3737
- type: bind
3838
read_only: false
39-
source: ./database/storage
39+
source: ./docker/storage
4040
target: /var/storage
4141

4242
database:
@@ -51,9 +51,9 @@ services:
5151
target: /var/lib/mysql
5252
- type: bind
5353
read_only: true
54-
source: ./database/configuration
54+
source: ./docker/database/configuration
5555
target: /etc/mysql/conf.d
5656
- type: bind
5757
read_only: true
58-
source: ./database/populate
58+
source: ./docker/database/populate
5959
target: /docker-entrypoint-initdb.d

docker/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
storage/*
2+
!storage/.gitkeep
File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CREATE DATABASE bookkeeping CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
CREATE USER 'cern'@'%' IDENTIFIED BY 'cern';
22

33
GRANT ALL PRIVILEGES ON bookkeeping.* TO 'cern'@'%' ;
4-
GRANT ALL PRIVILEGES ON bookkeeping_test.* TO 'cern'@'%' ;

0 commit comments

Comments
 (0)