Skip to content

Commit 8a4ecb1

Browse files
toomoretoomore
committed
Upgrade packages
Signed-off-by: Toomore Chiang <[email protected]>
1 parent f71d3d3 commit 8a4ecb1

10 files changed

+78
-50
lines changed

‎.github/workflows/build_image.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Checkout
1818
uses: actions/checkout@v3
1919
- name: Build the base image
20-
run: docker build -t coscupweb-base:23.06.28 -f ./Dockerfile-base-dev ./
20+
run: docker build -t coscupweb-base:23.07.25 -f ./Dockerfile-base-dev ./
2121
- name: List images
2222
run: docker images
2323
- name: Rename sample setting file

‎.github/workflows/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Rename sample setting file
1919
run: mv ./setting_sample.py ./setting.py
2020
- name: Build the base image
21-
run: docker build -t coscupweb-base:23.06.28 -f ./Dockerfile-base-dev ./
21+
run: docker build -t coscupweb-base:23.07.25 -f ./Dockerfile-base-dev ./
2222
- name: UP
2323
env:
2424
CLIENT_ID: ${{ secrets.TDX_CLIENT_ID }}

‎Dockerfile-app

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM coscupweb-base:23.06.28
1+
FROM coscupweb-base:23.07.25
22

33
ADD ./client_secret.json \
44
./secretary-e00794553a7d.json \

‎Dockerfile-app-dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM coscupweb-base:23.06.28
1+
FROM coscupweb-base:23.07.25
22

33
ADD ./setting.py \
44
./uwsgi.ini \

‎build-base.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
docker build --no-cache=true -t coscupweb-base:23.06.28 -f ./Dockerfile-base ./
1+
docker build --no-cache=true -t coscupweb-base:23.07.25 -f ./Dockerfile-base ./

‎docker-compose.yml

+36-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
- backend
2323

2424
workerapp:
25-
image: "coscupweb-base:23.06.28"
25+
image: "coscupweb-base:23.07.25"
2626
links:
2727
- "memcached-prod:memcached"
2828
- "queue_sender:rabbitmq"
@@ -55,7 +55,7 @@ services:
5555
command: sh
5656

5757
cmdapp:
58-
image: "coscupweb-base:23.06.28"
58+
image: "coscupweb-base:23.07.25"
5959
links:
6060
- "memcached-prod:memcached"
6161
- "queue_sender:rabbitmq"
@@ -87,7 +87,7 @@ services:
8787
entrypoint: ["poetry", "run", "python3", "cmdtools/main.py"]
8888

8989
webapp:
90-
image: "coscupweb-base:23.06.28"
90+
image: "coscupweb-base:23.07.25"
9191
links:
9292
- "memcached-prod:memcached"
9393
- "queue_sender:rabbitmq"
@@ -120,10 +120,21 @@ services:
120120
replicas: 1
121121
networks:
122122
- backend
123-
entrypoint: ["poetry", "run", "flask", "--app", "main:app", "run", "--host", "0.0.0.0", "--debug"]
123+
entrypoint:
124+
[
125+
"poetry",
126+
"run",
127+
"flask",
128+
"--app",
129+
"main:app",
130+
"run",
131+
"--host",
132+
"0.0.0.0",
133+
"--debug",
134+
]
124135

125136
apiapp:
126-
image: "coscupweb-base:23.06.28"
137+
image: "coscupweb-base:23.07.25"
127138
links:
128139
- "memcached-prod:memcached"
129140
- "queue_sender:rabbitmq"
@@ -159,7 +170,7 @@ services:
159170
entrypoint: ["poetry", "run", "uvicorn", "api.main:app", "--reload"]
160171

161172
celery_worker:
162-
image: "coscupweb-base:23.06.28"
173+
image: "coscupweb-base:23.07.25"
163174
links:
164175
- "queue_sender:rabbitmq"
165176
- "secretary_mongo:mongo"
@@ -185,10 +196,27 @@ services:
185196
- CLIENT_SECRET=${CLIENT_SECRET}
186197
networks:
187198
- backend
188-
entrypoint: ["poetry", "run", "celery", "-A", "celery_task.celery_main", "worker", "-B", "-l", "info", "-O", "fair", "-c", "4", "--logfile", "/var/log/workers/log.log"]
199+
entrypoint:
200+
[
201+
"poetry",
202+
"run",
203+
"celery",
204+
"-A",
205+
"celery_task.celery_main",
206+
"worker",
207+
"-B",
208+
"-l",
209+
"info",
210+
"-O",
211+
"fair",
212+
"-c",
213+
"4",
214+
"--logfile",
215+
"/var/log/workers/log.log",
216+
]
189217

190218
docs:
191-
image: "coscupweb-base:23.06.28"
219+
image: "coscupweb-base:23.07.25"
192220
links:
193221
- "memcached-prod:memcached"
194222
- "queue_sender:rabbitmq"

‎docs_dev/docs/dev/build-base-image.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ We use the [docker compose](https://docs.docker.com/compose/) (not **docker-comp
1414

1515
Build the base image for local development.
1616

17-
docker build -t coscupweb-base:23.06.28 -f ./Dockerfile-base-dev ./
17+
docker build -t coscupweb-base:23.07.25 -f ./Dockerfile-base-dev ./
1818

1919
!!! note
2020

‎docs_dev/docs/dev/build-base-image.zh_TW.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ description: 在本地端建立基本映像檔
1919

2020
建立「基本映像檔」於本地開發。（建立的版本號會依[每次釋出](https://github.com/COSCUP/COSCUP-Volunteer/releases)而有所改變）
2121

22-
docker build -t coscupweb-base:23.06.28 -f ./Dockerfile-base-dev ./
22+
docker build -t coscupweb-base:23.07.25 -f ./Dockerfile-base-dev ./
2323

2424
!!! note
2525

‎poetry.lock

+34-34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ authors = ["COSCUP Volunteer <[email protected]>"]
33
description = "COSCUP Volunteer 志工服務系統，主要解決招募、人員管理、行政流程建立。"
44
license = "AGPL-3.0"
55
name = "coscup-volunteer"
6-
version = "2023.06.28"
6+
version = "2023.07.25"
77

88
[tool.poetry.dependencies]
99
Markdown = "^3.3.7"

0 commit comments

Comments
 (0)