diff --git a/.github/workflows/build_image.yml b/.github/workflows/build_image.yml index fc5cca6a..61403819 100644 --- a/.github/workflows/build_image.yml +++ b/.github/workflows/build_image.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Build the base image - run: docker build -t coscupweb-base:23.11.27 -f ./Dockerfile-base-dev ./ + run: docker build -t coscupweb-base:23.12.23 -f ./Dockerfile-base-dev ./ - name: List images run: docker images - name: Rename sample setting file diff --git a/.github/workflows/docker-compose.yml b/.github/workflows/docker-compose.yml index cee64c1a..89763c23 100644 --- a/.github/workflows/docker-compose.yml +++ b/.github/workflows/docker-compose.yml @@ -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.11.27 -f ./Dockerfile-base-dev ./ + run: docker build -t coscupweb-base:23.12.23 -f ./Dockerfile-base-dev ./ - name: UP env: CLIENT_ID: ${{ secrets.TDX_CLIENT_ID }} diff --git a/Dockerfile-app b/Dockerfile-app index fbd53473..40319d82 100644 --- a/Dockerfile-app +++ b/Dockerfile-app @@ -1,4 +1,4 @@ -FROM coscupweb-base:23.11.27 +FROM coscupweb-base:23.12.23 ADD ./client_secret.json \ ./secretary-e00794553a7d.json \ diff --git a/Dockerfile-app-dev b/Dockerfile-app-dev index f35441e5..dfeca30f 100644 --- a/Dockerfile-app-dev +++ b/Dockerfile-app-dev @@ -1,4 +1,4 @@ -FROM coscupweb-base:23.11.27 +FROM coscupweb-base:23.12.23 ADD ./setting.py \ ./uwsgi.ini \ diff --git a/build-base.sh b/build-base.sh index 8e981ae9..1cc097ea 100644 --- a/build-base.sh +++ b/build-base.sh @@ -1 +1 @@ -docker build --no-cache=true -t coscupweb-base:23.11.27 -f ./Dockerfile-base ./ +docker build --no-cache=true -t coscupweb-base:23.12.23 -f ./Dockerfile-base ./ diff --git a/docker-compose.yml b/docker-compose.yml index e0ec23da..f7287232 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: - backend workerapp: - image: "coscupweb-base:23.11.27" + image: "coscupweb-base:23.12.23" links: - "memcached-prod:memcached" - "queue_sender:rabbitmq" @@ -55,7 +55,7 @@ services: command: sh cmdapp: - image: "coscupweb-base:23.11.27" + image: "coscupweb-base:23.12.23" links: - "memcached-prod:memcached" - "queue_sender:rabbitmq" @@ -87,7 +87,7 @@ services: entrypoint: ["poetry", "run", "python3", "cmdtools/main.py"] webapp: - image: "coscupweb-base:23.11.27" + image: "coscupweb-base:23.12.23" links: - "memcached-prod:memcached" - "queue_sender:rabbitmq" @@ -134,7 +134,7 @@ services: ] apiapp: - image: "coscupweb-base:23.11.27" + image: "coscupweb-base:23.12.23" links: - "memcached-prod:memcached" - "queue_sender:rabbitmq" @@ -170,7 +170,7 @@ services: entrypoint: ["poetry", "run", "uvicorn", "api.main:app", "--reload"] celery_worker: - image: "coscupweb-base:23.11.27" + image: "coscupweb-base:23.12.23" links: - "queue_sender:rabbitmq" - "secretary_mongo:mongo" @@ -216,7 +216,7 @@ services: ] docs: - image: "coscupweb-base:23.11.27" + image: "coscupweb-base:23.12.23" links: - "memcached-prod:memcached" - "queue_sender:rabbitmq" diff --git a/docs_dev/docs/dev/build-base-image.md b/docs_dev/docs/dev/build-base-image.md index d91c8c9d..3ebced16 100644 --- a/docs_dev/docs/dev/build-base-image.md +++ b/docs_dev/docs/dev/build-base-image.md @@ -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.11.27 -f ./Dockerfile-base-dev ./ + docker build -t coscupweb-base:23.12.23 -f ./Dockerfile-base-dev ./ !!! note diff --git a/docs_dev/docs/dev/build-base-image.zh-TW.md b/docs_dev/docs/dev/build-base-image.zh-TW.md index 5041b4a5..ba94972a 100644 --- a/docs_dev/docs/dev/build-base-image.zh-TW.md +++ b/docs_dev/docs/dev/build-base-image.zh-TW.md @@ -19,7 +19,7 @@ description: 在本地端建立基本映像檔 建立「基本映像檔」於本地開發。(建立的版本號會依[每次釋出](https://github.com/COSCUP/COSCUP-Volunteer/releases)而有所改變) - docker build -t coscupweb-base:23.11.27 -f ./Dockerfile-base-dev ./ + docker build -t coscupweb-base:23.12.23 -f ./Dockerfile-base-dev ./ !!! note diff --git a/pyproject.toml b/pyproject.toml index 0e818793..4d0a7c67 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ authors = ["COSCUP Volunteer "] description = "COSCUP Volunteer 志工服務系統,主要解決招募、人員管理、行政流程建立。" license = "AGPL-3.0" name = "coscup-volunteer" -version = "2023.11.27" +version = "2023.12.23" [tool.poetry.dependencies] Markdown = "^3.3.7"