浏览代码

Docker: rename DATABASE_TYPE into TEST_DATABASE_ENGINE

Bastien Sevajol (Algoo) 8 年前
父节点
当前提交
934147c7b1
共有 2 个文件被更改,包括 14 次插入14 次删除
  1. 4 4
      README.md
  2. 10 10
      docker/Debian_Tests/entrypoint.sh

+ 4 - 4
README.md 查看文件

462
 
462
 
463
 Run tests with PostgreSQL
463
 Run tests with PostgreSQL
464
 
464
 
465
-    docker run -e DATABASE_TYPE=postgresql tracim:tests
465
+    docker run -e TEST_DATABASE_ENGINE=postgresql tracim:tests
466
 
466
 
467
 Run tests with MySQL
467
 Run tests with MySQL
468
 
468
 
469
-    docker run -e DATABASE_TYPE=mysql tracim:tests
469
+    docker run -e TEST_DATABASE_ENGINE=mysql tracim:tests
470
 
470
 
471
 Run tests with SQLite
471
 Run tests with SQLite
472
 
472
 
473
-    docker run -e DATABASE_TYPE=sqlite tracim:tests
473
+    docker run -e TEST_DATABASE_ENGINE=sqlite tracim:tests
474
 
474
 
475
 ##### Run test on specific commit/branch
475
 ##### Run test on specific commit/branch
476
 
476
 
477
 To run tests on specific branch or commit, use ``CHECKOUT`` parameter, eg:
477
 To run tests on specific branch or commit, use ``CHECKOUT`` parameter, eg:
478
 
478
 
479
-    docker run -e DATABASE_TYPE=postgresql -e CHECKOUT=<branch_or_commit_name> tracim:tests
479
+    docker run -e TEST_DATABASE_ENGINE=postgresql -e CHECKOUT=<branch_or_commit_name> tracim:tests
480
 
480
 
481
 #### Run Prod/dev containers
481
 #### Run Prod/dev containers
482
 
482
 

+ 10 - 10
docker/Debian_Tests/entrypoint.sh 查看文件

3
 #
3
 #
4
 # ENVIRONMENT VARIABLES ARE:
4
 # ENVIRONMENT VARIABLES ARE:
5
 #
5
 #
6
-# * DATABASE_TYPE (values: postgresql, mysql, sqlite)
6
+# * TEST_DATABASE_ENGINE (values: postgresql, mysql, sqlite)
7
 # * CHECKOUT (values: a commit or branch name)
7
 # * CHECKOUT (values: a commit or branch name)
8
 #
8
 #
9
 
9
 
13
     echo "CHECKOUT set to $CHECKOUT"
13
     echo "CHECKOUT set to $CHECKOUT"
14
 fi
14
 fi
15
 
15
 
16
-# Ensure DATABASE_TYPE is set
17
-if ! [ -n "$DATABASE_TYPE" ]; then
18
-    echo "You must set DATABASE_TYPE environment variable"
16
+# Ensure TEST_DATABASE_ENGINE is set
17
+if ! [ -n "$TEST_DATABASE_ENGINE" ]; then
18
+    echo "You must set TEST_DATABASE_ENGINE environment variable"
19
     exit 1
19
     exit 1
20
 fi
20
 fi
21
 
21
 
22
-# Ensure DATABASE_TYPE value
23
-case "$DATABASE_TYPE" in
22
+# Ensure TEST_DATABASE_ENGINE value
23
+case "$TEST_DATABASE_ENGINE" in
24
     postgresql|mysql|sqlite) ;;
24
     postgresql|mysql|sqlite) ;;
25
-    *) echo "DATABASE_TYPE environment variable must be one of these: \
25
+    *) echo "TEST_DATABASE_ENGINE environment variable must be one of these: \
26
 postgresql, mysql, sqlite" ; exit 1 ;;
26
 postgresql, mysql, sqlite" ; exit 1 ;;
27
 esac
27
 esac
28
 
28
 
31
 cp /tracim/tracim/wsgidav.conf.sample /tracim/tracim/wsgidav.conf
31
 cp /tracim/tracim/wsgidav.conf.sample /tracim/tracim/wsgidav.conf
32
 
32
 
33
 # PostgreSQL case
33
 # PostgreSQL case
34
-if [ "$DATABASE_TYPE" = postgresql ] ; then
34
+if [ "$TEST_DATABASE_ENGINE" = postgresql ] ; then
35
     service postgresql start
35
     service postgresql start
36
     su - postgres -s /bin/bash -c "psql -c \"CREATE DATABASE tracim;\""
36
     su - postgres -s /bin/bash -c "psql -c \"CREATE DATABASE tracim;\""
37
     su - postgres -s /bin/bash -c "psql -c \"ALTER USER postgres WITH PASSWORD 'dummy';\""
37
     su - postgres -s /bin/bash -c "psql -c \"ALTER USER postgres WITH PASSWORD 'dummy';\""
40
 fi
40
 fi
41
 
41
 
42
 # MySQL case
42
 # MySQL case
43
-if [ "$DATABASE_TYPE" = mysql ] ; then
43
+if [ "$TEST_DATABASE_ENGINE" = mysql ] ; then
44
     service mysql start
44
     service mysql start
45
     mysql -e 'CREATE DATABASE tracim;'
45
     mysql -e 'CREATE DATABASE tracim;'
46
     sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = mysql+oursql:\/\/root@localhost\/tracim/" /tracim/tracim/test.ini
46
     sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = mysql+oursql:\/\/root@localhost\/tracim/" /tracim/tracim/test.ini
48
 fi
48
 fi
49
 
49
 
50
 # SQLite case
50
 # SQLite case
51
-if [ "$DATABASE_TYPE" = sqlite ] ; then
51
+if [ "$TEST_DATABASE_ENGINE" = sqlite ] ; then
52
     sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = sqlite:\/\/\/tracim.sqlite/" /tracim/tracim/test.ini
52
     sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = sqlite:\/\/\/tracim.sqlite/" /tracim/tracim/test.ini
53
     sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = sqlite:\/\/\/tracim.sqlite/" /tracim/tracim/development.ini
53
     sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = sqlite:\/\/\/tracim.sqlite/" /tracim/tracim/development.ini
54
 fi
54
 fi