Skip to content

Commit f1fbb28

Browse files
committed
feat(docker): update seatable version to 5.2.7 and remove memcached references
1 parent 3d7a24a commit f1fbb28

File tree

4 files changed

+19
-33
lines changed

4 files changed

+19
-33
lines changed

README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
## Addition Enviroments
44

55
- REDIS_HOST: `string`
6-
- MEMCACHED_HOST: `string`
7-
- SEATABLE_SERVER_URL_FORCE_HTTPS: `bool`
86
- it's useful when use with reverse proxy like traefik.
97
- DB_ROOT_PASSWD_FILE: `filepath`
108

@@ -16,7 +14,16 @@
1614
## Upgrade
1715
### Checking new script
1816
1. Run container with new seatable/seatable-enterprise:latest version, using default [docker-compose.yml](https://manual.seatable.io/docker/Enterprise-Edition/Deploy%20SeaTable-EE%20with%20Docker/#downloading-and-modifying-docker-composeyml)
19-
2. copy file at `/templates/`
17+
18+
2. Run `docker-compose up -d` to start the container
19+
20+
3. copy file at `/templates/`
21+
```
22+
docker cp seatable-server:/templates test/templates
2023
```
21-
docker cp CONTAINER:/templates test/templates
24+
25+
## Test Dockerfile
26+
2227
```
28+
docker compose up --build
29+
```

docker-compose.override.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
version: '3.8'
2-
31
services:
42
seatable-server:
53
build:
64
context: .
75
dockerfile: Dockerfile
86
args:
9-
SEATABLE_VERSION: ${SEATABLE_VERSION:-5.1.9}
7+
SEATABLE_VERSION: ${SEATABLE_VERSION:-5.2.7}

docker-compose.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ networks:
88

99
services:
1010
seatable-server:
11-
image: ${SEATABLE_IMAGE:-seatable/seatable-enterprise:5.1.9}
11+
image: ${SEATABLE_IMAGE:-seatable/seatable-enterprise:5.2.7}
1212
container_name: seatable-server
1313
volumes:
1414
- type: bind
@@ -46,8 +46,6 @@ services:
4646
depends_on:
4747
mariadb:
4848
condition: service_healthy
49-
memcached:
50-
condition: service_healthy
5149
redis:
5250
condition: service_healthy
5351
networks:
@@ -89,21 +87,8 @@ services:
8987
# otherwise the container stays unhealthy.
9088
# more info at https://admin.seatable.io/upgrade/extra-upgrade-notice/
9189

92-
memcached:
93-
image: ${SEATABLE_MEMCACHED_IMAGE:-memcached:1.6.32-bookworm}
94-
restart: unless-stopped
95-
container_name: memcached
96-
entrypoint: memcached -m 256
97-
networks:
98-
- backend-seatable-net
99-
healthcheck:
100-
test: ["CMD-SHELL", "timeout 2 bash -c '</dev/tcp/localhost/11211'"]
101-
interval: 20s
102-
retries: 3
103-
timeout: 5s
104-
10590
redis:
106-
image: ${SEATABLE_REDIS_IMAGE:-redis:7.2.6-bookworm}
91+
image: ${SEATABLE_REDIS_IMAGE:-redis:7.2.7-bookworm}
10792
restart: unless-stopped
10893
container_name: redis
10994
networks:

templates/init_config.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from django.core.management.utils import get_random_secret_key
33
# Additional env variables
44
REDIS_HOST = os.getenv('REDIS_HOST', 'redis')
5-
MEMCACHED_HOST = os.getenv('MEMCACHED_HOST', 'memcached')
65

76
DB_HOST = os.getenv('DB_HOST', 'db')
87
DB_ROOT_PASSWD = os.getenv('DB_ROOT_PASSWD', '')
@@ -101,14 +100,10 @@
101100
102101
CACHES = {
103102
'default': {
104-
'BACKEND': 'django_pylibmc.memcached.PyLibMCCache',
105-
'LOCATION': '%s',
106-
},
107-
'locmem': {
108-
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
109-
},
103+
'BACKEND': 'django.core.cache.backends.redis.RedisCache',
104+
'LOCATION': 'redis://%s:6379',
105+
}
110106
}
111-
COMPRESS_CACHE_BACKEND = 'locmem'
112107
113108
SECRET_KEY = '%s'
114109
@@ -138,7 +133,7 @@
138133
DISABLE_ADDRESSBOOK_V1 = True
139134
ENABLE_ADDRESSBOOK_V2 = True
140135
141-
""" % (DB_HOST, DB_ROOT_PASSWD, MEMCACHED_HOST, get_random_secret_key(), PRIVATE_KEY,
136+
""" % (DB_HOST, DB_ROOT_PASSWD, REDIS_HOST, get_random_secret_key(), PRIVATE_KEY,
142137
SERVER_URL, SERVER_URL, SERVER_URL, SERVER_URL, SERVER_URL, TIME_ZONE)
143138

144139
if not os.path.exists(dtable_web_config_path):
@@ -414,6 +409,7 @@
414409
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
415410
proxy_set_header X-Forwarded-Host $server_name;
416411
proxy_set_header X-Forwarded-Proto $scheme;
412+
client_max_body_size 10m;
417413
418414
access_log /opt/nginx-logs/dtable-db.access.log seatableformat;
419415
error_log /opt/nginx-logs/dtable-db.error.log;

0 commit comments

Comments
 (0)