Skip to content

Commit cc1b204

Browse files
committed
update search-index actions
1 parent 64f8689 commit cc1b204

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

.github/workflows/search-index-update.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ jobs:
6868
6969
- name: repository name fix and env
7070
run: |
71-
echo "letsencrypt_email=${{ secrets.LETSENCRYPT_EMAIL }}" >> $GITHUB_ENV
7271
echo "TAG_NAME=latest" >> $GITHUB_ENV
7372
if [ "${{ github.event.release.tag_name }}" != "" ]; then
7473
echo "TAG_NAME=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
@@ -78,15 +77,12 @@ jobs:
7877
fi;
7978
echo "image_repository_name=servicestack/docs-search" >> $GITHUB_ENV
8079
echo "domain=search.docs.servicestack.net" >> $GITHUB_ENV
81-
echo "letsencrypt_email=${{ secrets.LETSENCRYPT_EMAIL }}" >> $GITHUB_ENV
8280
echo "app_name=servicestack-docs-search" >> $GITHUB_ENV
8381
echo "typesense_api_key=${{ secrets.TYPESENSE_API_KEY }}" >> $GITHUB_ENV
8482
8583
- name: Write .env file
8684
run: |
87-
echo "HOST_DOMAIN=${{ env.domain }}" > .env
88-
echo "LETSENCRYPT_EMAIL=${{ env.letsencrypt_email }}" >> .env
89-
echo "TYPESENSE_API_KEY=${{ env.typesense_api_key }}" >> .env
85+
echo "TYPESENSE_API_KEY=${{ env.typesense_api_key }}" > .env
9086
cp search-server/typesense-server/docker-compose.yml ./
9187
9288
- name: Login to GitHub Container Registry
@@ -109,7 +105,7 @@ jobs:
109105
- name: copy compose file via scp
110106
uses: appleboy/scp-action@v0.1.3
111107
with:
112-
host: 52.201.116.245
108+
host: 5.78.148.221
113109
username: ${{ secrets.DEPLOY_USERNAME }}
114110
port: 22
115111
key: ${{ secrets.DEPLOY_KEY }}
@@ -123,13 +119,18 @@ jobs:
123119
APPTOKEN: ${{ secrets.GITHUB_TOKEN }}
124120
USERNAME: ${{ secrets.DEPLOY_USERNAME }}
125121
with:
126-
host: 52.201.116.245
122+
host: 5.78.148.221
127123
username: ${{ secrets.DEPLOY_USERNAME }}
128124
key: ${{ secrets.DEPLOY_KEY }}
129125
port: 22
130126
envs: APPTOKEN,USERNAME
131127
script: |
132128
echo $APPTOKEN | docker login ghcr.io -u $USERNAME --password-stdin
133129
cd ~/.deploy/docs-typesense
134-
docker-compose pull
135-
docker-compose up -d
130+
docker compose pull
131+
docker compose up -d
132+
docker exec kamal-proxy kamal-proxy deploy \
133+
--service=docs-search \
134+
--target=servicestack-docs-search:8108 \
135+
--host=search.docs.servicestack.net \
136+
--tls

search-server/typesense-server/docker-compose.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@ version: '3.9'
22
services:
33
servicestack-docs-search:
44
image: ghcr.io/servicestack/docs-search:latest
5-
network_mode: bridge
65
restart: always
7-
ports:
8-
- "8108"
6+
networks:
7+
- kamal
98
environment:
10-
VIRTUAL_HOST: "${HOST_DOMAIN}"
11-
LETSENCRYPT_HOST: "${HOST_DOMAIN}"
12-
LETSENCRYPT_EMAIL: "${LETSENCRYPT_EMAIL}"
139
TYPESENSE_API_KEY: "${TYPESENSE_API_KEY}"
1410
command:
1511
- "--data-dir"
@@ -18,3 +14,7 @@ services:
1814
- "${TYPESENSE_API_KEY}"
1915
- "--enable-cors"
2016

17+
networks:
18+
kamal:
19+
external: true
20+

0 commit comments

Comments
 (0)