Skip to content

Commit b3644c6

Browse files
committed
Simplify Docker login and fix workflow configuration
1 parent 7b791cd commit b3644c6

File tree

1 file changed

+22
-41
lines changed

1 file changed

+22
-41
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ jobs:
2626
with:
2727
python-version: '3.9'
2828

29+
- name: Create environment files
30+
run: |
31+
echo "${{ secrets.OPENAI_API_KEY }}" > openai_api_key.txt
32+
echo "${{ secrets.WEAVIATE_API_KEY }}" > weaviate_api_key.txt
33+
2934
- name: Install dependencies
3035
run: |
3136
python -m pip install --upgrade pip
@@ -37,6 +42,9 @@ jobs:
3742
pip install -e .
3843
3944
- name: Run tests
45+
env:
46+
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
47+
WEAVIATE_API_KEY: ${{ secrets.WEAVIATE_API_KEY }}
4048
run: |
4149
pytest src/test_connection.py -v
4250
@@ -47,59 +55,35 @@ jobs:
4755
- name: Checkout code
4856
uses: actions/checkout@v3
4957

58+
- name: Set up QEMU
59+
uses: docker/setup-qemu-action@v2
60+
5061
- name: Set up Docker Buildx
5162
uses: docker/setup-buildx-action@v2
5263

5364
- name: Login to Docker Hub
5465
uses: docker/login-action@v2
5566
with:
56-
username: ${{ env.DOCKER_USERNAME }}
67+
username: tuandung12092002
5768
password: ${{ secrets.DOCKERHUB_TOKEN }}
58-
registry: https://hub.docker.com
59-
60-
- name: Extract metadata for Search Server
61-
id: meta-search
62-
uses: docker/metadata-action@v4
63-
with:
64-
images: ${{ env.SEARCH_SERVER_IMAGE }}
65-
tags: |
66-
type=ref,event=branch
67-
type=ref,event=pr
68-
type=semver,pattern={{version}}
69-
type=semver,pattern={{major}}.{{minor}}
70-
type=sha,format=long
7169

7270
- name: Build and Push Search Server Image
7371
uses: docker/build-push-action@v4
7472
with:
7573
context: .
7674
file: ./docker/search_server.Dockerfile
7775
push: true
78-
tags: ${{ steps.meta-search.outputs.tags }}
79-
labels: ${{ steps.meta-search.outputs.labels }}
76+
tags: tuandung12092002/semantic-search-server:latest
8077
cache-from: type=gha
8178
cache-to: type=gha,mode=max
8279

83-
- name: Extract metadata for Demo App
84-
id: meta-demo
85-
uses: docker/metadata-action@v4
86-
with:
87-
images: ${{ env.DEMO_APP_IMAGE }}
88-
tags: |
89-
type=ref,event=branch
90-
type=ref,event=pr
91-
type=semver,pattern={{version}}
92-
type=semver,pattern={{major}}.{{minor}}
93-
type=sha,format=long
94-
9580
- name: Build and Push Demo App Image
9681
uses: docker/build-push-action@v4
9782
with:
9883
context: .
9984
file: ./docker/demo_app.Dockerfile
10085
push: true
101-
tags: ${{ steps.meta-demo.outputs.tags }}
102-
labels: ${{ steps.meta-demo.outputs.labels }}
86+
tags: tuandung12092002/semantic-search-demo:latest
10387
cache-from: type=gha
10488
cache-to: type=gha,mode=max
10589

@@ -110,19 +94,16 @@ jobs:
11094
- name: Checkout code
11195
uses: actions/checkout@v3
11296

113-
- name: Set up Docker Buildx
114-
uses: docker/setup-buildx-action@v2
115-
116-
- name: Create secrets directory
117-
run: mkdir -p secrets
118-
119-
- name: Create OpenAI API key file
120-
run: echo "${{ secrets.OPENAI_API_KEY }}" > secrets/openai_api_key.txt
121-
122-
- name: Create Weaviate API key file
123-
run: echo "${{ secrets.WEAVIATE_API_KEY }}" > secrets/weaviate_api_key.txt
97+
- name: Create environment files
98+
run: |
99+
mkdir -p secrets
100+
echo "${{ secrets.OPENAI_API_KEY }}" > secrets/openai_api_key.txt
101+
echo "${{ secrets.WEAVIATE_API_KEY }}" > secrets/weaviate_api_key.txt
124102
125103
- name: Deploy application
104+
env:
105+
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
106+
WEAVIATE_API_KEY: ${{ secrets.WEAVIATE_API_KEY }}
126107
run: |
127108
docker-compose -f docker/docker-compose.full.yml up -d
128109

0 commit comments

Comments
 (0)