Skip to content

Commit

Permalink
Upgraded libs
Browse files Browse the repository at this point in the history
Signed-off-by: Toomore Chiang <[email protected]>
  • Loading branch information
toomore committed Sep 27, 2023
1 parent e45a235 commit 650f1a9
Show file tree
Hide file tree
Showing 12 changed files with 629 additions and 630 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Install and configure Poetry
uses: snok/install-poetry@v1
with:
version: 1.5.1
version: 1.6.1
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true
Expand Down
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.09.29 -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.09.29 -f ./Dockerfile-base-dev ./
- name: UP
env:
CLIENT_ID: ${{ secrets.TDX_CLIENT_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Install and configure Poetry
uses: snok/install-poetry@v1
with:
version: 1.5.1
version: 1.6.1
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true
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.09.29

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.09.29

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.09.29 -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.09.29"
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.09.29"
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.09.29"
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.09.29"
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.09.29"
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.09.29"
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.09.29 -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.09.29 -f ./Dockerfile-base-dev ./

!!! note

Expand Down
Loading

0 comments on commit 650f1a9

Please sign in to comment.