Skip to content

Commit 2051e5c

Browse files
arcosxarcosx
authored
Merge pull request #91 from Triple-Z/rename-compose
Rename docker compose group
2 parents 19de41c + bb986a6 commit 2051e5c

File tree

7 files changed

+30
-27
lines changed

7 files changed

+30
-27
lines changed

‎conf/db.example.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"Master": {
3-
"User": "root",
4-
"Pass": "safeu",
5-
"Host": "db",
3+
"User": "your_db_username",
4+
"Pass": "your_db_password",
5+
"Host": "your_db_ip_address",
66
"Port": "3306",
77
"Database": "safeu",
88
"MaxIdleConns": 30,
99
"MaxOpenConns": 100,
1010
"Debug": false
1111
},
1212
"Redis": {
13-
"Host": "redis",
13+
"Host": "safeu-redis",
1414
"Port": "6379",
1515
"Pass": ""
1616
}

‎deployments/dev/docker-compose.yml renamed to ‎deployments/dev-safeu/docker-compose.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
environment:
2626
- TZ=Asia/Shanghai
2727
ports:
28-
- "8080:8080"
28+
- "9000:8080"
2929
networks:
3030
- safeu-app-net
3131
depends_on:
@@ -38,12 +38,13 @@ services:
3838
# - TZ=Asia/Shanghai
3939
# - MYSQL_ROOT_PASSWORD=safeu
4040
# - MYSQL_DATABASE=safeu
41-
# image: mysql:5.7.23
41+
## image: mysql:5.7.23
42+
# image: mariadb:10.3
4243
# volumes:
4344
# - ../../data-dev/mariadb:/var/lib/mysql
4445
# - ../../conf/mariadb:/etc/mysql/conf.d
45-
# ports:
46-
# - "3306:3306"
46+
## ports:
47+
## - "3306:3306"
4748
# networks:
4849
# - safeu-app-net
4950
# restart: on-failure

‎deployments/prod/docker-compose.yml renamed to ‎deployments/prod-safeu/docker-compose.yml

File renamed without changes.

‎faas/zip-items.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# -*- coding: UTF-8 -*-
12
# Code for Python 2.7
23

34
import os
@@ -26,7 +27,7 @@ def handler(environ, start_response):
2627
except(ValueError):
2728
request_body_size = 0
2829
request_body = environ['wsgi.input'].read(request_body_size)
29-
request_body = urllib.unquote(request_body).decode('utf8')
30+
request_body = urllib.unquote(request_body).decode('utf8')
3031

3132
# get request method
3233
request_method = environ['REQUEST_METHOD']
@@ -125,5 +126,6 @@ def make_zip(source_dir, output_filename):
125126
for filename in filenames:
126127
pathfile = os.path.join(parent, filename)
127128
arcname = pathfile[pre_len:].strip(os.path.sep)
128-
zipf.write(pathfile, arcname)
129+
zipf.write(pathfile, arcname.encode("utf-8"))
130+
# zipf.write(pathfile, arcname.encode("gbk")) # for Windows(Chinese characters)
129131
zipf.close()

‎item/download.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/aliyun/aliyun-oss-go-sdk/oss"
1313
"github.com/gin-gonic/gin"
1414
"github.com/gin-gonic/gin/json"
15-
"github.com/satori/go.uuid"
15+
uuid "github.com/satori/go.uuid"
1616
)
1717

1818
type PackRequest struct {
@@ -197,7 +197,7 @@ func DownloadItems(c *gin.Context) {
197197
})
198198
return
199199
}
200-
log.Println(c.ClientIP(), " Get the zip file signed url: ", url)
200+
log.Println(c.ClientIP(), " Get the single file signed url: ", url)
201201
c.JSON(http.StatusOK, gin.H{
202202
"url": url,
203203
})

‎scripts/dev-docker-compose.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,32 @@ then
1212

1313
if [ "$isD" = "y" ]||[ "$isD" = "Y" ]
1414
then
15-
sudo docker-compose -f ../deployments/dev/docker-compose.yml up -d
15+
sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml up -d
1616
else
17-
sudo docker-compose -f ../deployments/dev/docker-compose.yml up
17+
sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml up
1818
fi
1919
elif [ "$1" == "down" ]
2020
then
21-
sudo docker-compose -f ../deployments/dev/docker-compose.yml down
21+
sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml down
2222
elif [ "$1" == "build" ]
2323
then
24-
sudo docker-compose -f ../deployments/dev/docker-compose.yml build --force-rm
24+
sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml build --force-rm
2525
elif [ "$1" == "pull" ]
2626
then
27-
sudo docker-compose -f ../deployments/dev/docker-compose.yml pull
27+
sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml pull
2828
elif [ "$1" == "restart" ]
2929
then
30-
sudo docker-compose -f ../deployments/dev/docker-compose.yml restart -t 10
30+
sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml restart -t 10
3131
elif [ "$1" == "logs" ]
3232
then
3333
echo -e " Follow log output? (y/n, default: n): \c"
3434
read isF
3535
echo ""
3636
if [ "$isF" == "y" ] || [ "$isF" == "Y" ]
3737
then
38-
sudo docker-compose -f ../deployments/dev/docker-compose.yml logs -f
38+
sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml logs -f
3939
else
40-
sudo docker-compose -f ../deployments/dev/docker-compose.yml logs
40+
sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml logs
4141
fi
4242
elif [ "$1" == "help" ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]
4343
then

‎scripts/prod-docker-compose.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ echo -e "\n Build, up, down, restart, pull, check logs for SafeU production dock
77
if [ "$1" == "up" ]
88
then
99
mkdir -p ../data/mariadb
10-
sudo docker-compose -f ../deployments/prod/docker-compose.yml up -d
10+
sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml up -d
1111

1212
elif [ "$1" == "down" ]
1313
then
14-
sudo docker-compose -f ../deployments/prod/docker-compose.yml down
14+
sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml down
1515

1616
elif [ "$1" == "build" ]
1717
then
18-
sudo docker-compose -f ../deployments/prod/docker-compose.yml build --force-rm
18+
sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml build --force-rm
1919

2020
elif [ "$1" == "restart" ]
2121
then
22-
sudo docker-compose -f ../deployments/prod/docker-compose.yml restart -t 10
22+
sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml restart -t 10
2323

2424
elif [ "$1" == "pull" ]
2525
then
26-
sudo docker-compose -f ../deployments/prod/docker-compose.yml pull
26+
sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml pull
2727

2828
elif [ "$1" == "logs" ]
2929
then
@@ -32,9 +32,9 @@ then
3232
echo ""
3333
if [ "$isF" == "y" ] || [ "$isF" == "Y" ]
3434
then
35-
sudo docker-compose -f ../deployments/prod/docker-compose.yml logs -f
35+
sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml logs -f
3636
else
37-
sudo docker-compose -f ../deployments/prod/docker-compose.yml logs
37+
sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml logs
3838
fi
3939

4040
elif [ "$1" == "help" ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]

0 commit comments

Comments
 (0)