Skip to content

Commit

Permalink
Upgraded dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Toomore Chiang <[email protected]>
  • Loading branch information
toomore committed Oct 16, 2023
1 parent e45a235 commit 29ad4c0
Show file tree
Hide file tree
Showing 10 changed files with 916 additions and 848 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Build the base image
run: docker build -t coscupweb-base:23.07.25 -f ./Dockerfile-base-dev ./
run: docker build -t coscupweb-base:23.10.18 -f ./Dockerfile-base-dev ./
- name: List images
run: docker images
- name: Rename sample setting file
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Rename sample setting file
run: mv ./setting_sample.py ./setting.py
- name: Build the base image
run: docker build -t coscupweb-base:23.07.25 -f ./Dockerfile-base-dev ./
run: docker build -t coscupweb-base:23.10.18 -f ./Dockerfile-base-dev ./
- name: UP
env:
CLIENT_ID: ${{ secrets.TDX_CLIENT_ID }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-app
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM coscupweb-base:23.07.25
FROM coscupweb-base:23.10.18

ADD ./client_secret.json \
./secretary-e00794553a7d.json \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-app-dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM coscupweb-base:23.07.25
FROM coscupweb-base:23.10.18

ADD ./setting.py \
./uwsgi.ini \
Expand Down
2 changes: 1 addition & 1 deletion build-base.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker build --no-cache=true -t coscupweb-base:23.07.25 -f ./Dockerfile-base ./
docker build --no-cache=true -t coscupweb-base:23.10.18 -f ./Dockerfile-base ./
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- backend

workerapp:
image: "coscupweb-base:23.07.25"
image: "coscupweb-base:23.10.18"
links:
- "memcached-prod:memcached"
- "queue_sender:rabbitmq"
Expand Down Expand Up @@ -55,7 +55,7 @@ services:
command: sh

cmdapp:
image: "coscupweb-base:23.07.25"
image: "coscupweb-base:23.10.18"
links:
- "memcached-prod:memcached"
- "queue_sender:rabbitmq"
Expand Down Expand Up @@ -87,7 +87,7 @@ services:
entrypoint: ["poetry", "run", "python3", "cmdtools/main.py"]

webapp:
image: "coscupweb-base:23.07.25"
image: "coscupweb-base:23.10.18"
links:
- "memcached-prod:memcached"
- "queue_sender:rabbitmq"
Expand Down Expand Up @@ -134,7 +134,7 @@ services:
]

apiapp:
image: "coscupweb-base:23.07.25"
image: "coscupweb-base:23.10.18"
links:
- "memcached-prod:memcached"
- "queue_sender:rabbitmq"
Expand Down Expand Up @@ -170,7 +170,7 @@ services:
entrypoint: ["poetry", "run", "uvicorn", "api.main:app", "--reload"]

celery_worker:
image: "coscupweb-base:23.07.25"
image: "coscupweb-base:23.10.18"
links:
- "queue_sender:rabbitmq"
- "secretary_mongo:mongo"
Expand Down Expand Up @@ -216,7 +216,7 @@ services:
]

docs:
image: "coscupweb-base:23.07.25"
image: "coscupweb-base:23.10.18"
links:
- "memcached-prod:memcached"
- "queue_sender:rabbitmq"
Expand Down
2 changes: 1 addition & 1 deletion docs_dev/docs/dev/build-base-image.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We use the [docker compose](https://docs.docker.com/compose/) (not **docker-comp

Build the base image for local development.

docker build -t coscupweb-base:23.07.25 -f ./Dockerfile-base-dev ./
docker build -t coscupweb-base:23.10.18 -f ./Dockerfile-base-dev ./

!!! note

Expand Down
2 changes: 1 addition & 1 deletion docs_dev/docs/dev/build-base-image.zh_TW.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ description: 在本地端建立基本映像檔

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

docker build -t coscupweb-base:23.07.25 -f ./Dockerfile-base-dev ./
docker build -t coscupweb-base:23.10.18 -f ./Dockerfile-base-dev ./

!!! note

Expand Down
1,736 changes: 902 additions & 834 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["COSCUP Volunteer <[email protected]>"]
description = "COSCUP Volunteer 志工服務系統,主要解決招募、人員管理、行政流程建立。"
license = "AGPL-3.0"
name = "coscup-volunteer"
version = "2023.07.25"
version = "2023.10.18"

[tool.poetry.dependencies]
Markdown = "^3.3.7"
Expand Down

0 comments on commit 29ad4c0

Please sign in to comment.