Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align image name with GenAIExamples #1235

Merged
merged 2 commits into from
Jan 24, 2025
Merged

Align image name with GenAIExamples #1235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9527b4d
align image name with GenAIExamples
chensuyue Jan 24, 2025
f7cb1f7
update docker publish workflow
chensuyue Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker/compose/chathistory-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# this file should be run in the root of the repo
services:
chathistory-mongo:
chathistory-mongo-server:
build:
dockerfile: comps/chathistory/src/Dockerfile
image: ${REGISTRY:-opea}/chathistory-mongo:${TAG:-latest}
image: ${REGISTRY:-opea}/chathistory-mongo-server:${TAG:-latest}
3 changes: 2 additions & 1 deletion .github/workflows/manual-docker-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
type: string
images:
default: ""
description: "List of images to scan [dataprep-pgvector,dataprep-pinecone...]"
description: "List of images to publish [dataprep-pgvector,dataprep-pinecone...]"
required: false
type: string
tag:
Expand Down Expand Up @@ -45,6 +45,7 @@ jobs:
strategy:
matrix:
image: ${{ fromJSON(needs.get-image-list.outputs.matrix) }}
fail-fast: false
runs-on: "docker-build-gaudi"
steps:
- uses: docker/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion comps/chathistory/deployment/docker_compose/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
command: mongod --quiet --logpath /dev/null

chathistory-mongo:
image: ${REGISTRY:-opea}/chathistory-mongo:${TAG:-latest}
image: ${REGISTRY:-opea}/chathistory-mongo-server:${TAG:-latest}
container_name: chathistory-mongo-server
ports:
- "${CHATHISTORY_PORT:-6012}:6012"
Expand Down
2 changes: 1 addition & 1 deletion comps/chathistory/src/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export COLLECTION_NAME=${COLLECTION_NAME}

```bash
cd ../../../../
docker build -t opea/chathistory-mongo:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/chathistory/src/Dockerfile .
docker build -t opea/chathistory-mongo-server:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/chathistory/src/Dockerfile .
```

### Run Docker with CLI
Expand Down
6 changes: 3 additions & 3 deletions tests/chathistory/test_chathistory_mongo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ function build_docker_images() {
cd $WORKPATH
echo $(pwd)

docker build --no-cache -t opea/chathistory-mongo:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/chathistory/src/Dockerfile .
docker build --no-cache -t opea/chathistory-mongo-server:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/chathistory/src/Dockerfile .
if [ $? -ne 0 ]; then
echo "opea/chathistory-mongo built fail"
echo "opea/chathistory-mongo-server built fail"
exit 1
else
echo "opea/chathistory-mongo built successful"
echo "opea/chathistory-mongo-server built successful"
fi
}

Expand Down
Loading