Skip to content

Freeze Version numbers #114

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

Merged
merged 1 commit into from
Sep 29, 2022
Merged

Freeze Version numbers #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions refinery/template/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
- ./oathkeeper:/etc/config/oathkeeper:Z

refinery-authorizer:
image: kernai/refinery-authorizer:latest
image: kernai/refinery-authorizer:v1.2.0
restart: always
expose:
- 80
Expand All @@ -66,7 +66,7 @@ services:
- default

refinery-ui:
image: kernai/refinery-ui:latest
image: kernai/refinery-ui:v1.3.1
restart: always
ports:
- 7050:80
Expand All @@ -76,7 +76,7 @@ services:
- default

refinery-entry:
image: kernai/refinery-entry:latest
image: kernai/refinery-entry:v1.3.0
restart: always
environment:
- IS_OS=1
Expand All @@ -88,7 +88,7 @@ services:
postgres-migrate:
depends_on:
- graphql-postgres
image: kernai/refinery-gateway:latest
image: kernai/refinery-gateway:v1.3.2
environment:
- POSTGRES=postgresql://postgres:onetask@graphql-postgres:5432
command: alembic upgrade head
Expand All @@ -98,7 +98,7 @@ services:
refinery-gateway:
depends_on:
- refinery-config
image: kernai/refinery-gateway:latest
image: kernai/refinery-gateway:v1.3.2
restart: always
ports:
- 7051:80
Expand All @@ -108,10 +108,10 @@ services:
- /var/run/docker.sock:/var/run/docker.sock:Z
- graphql-sqlite:/sqlite
environment:
- AC_EXEC_ENV_IMAGE=kernai/refinery-ac-exec-env:latest
- LF_EXEC_ENV_IMAGE=kernai/refinery-lf-exec-env:latest
- ML_EXEC_ENV_IMAGE=kernai/refinery-ml-exec-env:latest
- RECORD_IDE_IMAGE=kernai/refinery-record-ide-env:latest
- AC_EXEC_ENV_IMAGE=kernai/refinery-ac-exec-env:v1.3.0
- LF_EXEC_ENV_IMAGE=kernai/refinery-lf-exec-env:v1.2.0
- ML_EXEC_ENV_IMAGE=kernai/refinery-ml-exec-env:v1.3.0
- RECORD_IDE_IMAGE=kernai/refinery-record-ide-env:v1.2.0
- POSTGRES=postgresql://postgres:onetask@graphql-postgres:5432
- LF_NETWORK=refinery_default
- WEAK_SUPERVISION=http://refinery-weak-supervisor:80
Expand Down Expand Up @@ -163,7 +163,7 @@ services:
refinery-gateway-proxy:
depends_on:
- graphql-postgres
image: kernai/refinery-gateway-proxy:latest
image: kernai/refinery-gateway-proxy:v1.3.0
restart: always
expose:
- 80
Expand Down Expand Up @@ -197,7 +197,7 @@ services:
- {LOCAL_VOLUME_MINIO}:/data

refinery-weak-supervisor:
image: kernai/refinery-weak-supervisor:latest
image: kernai/refinery-weak-supervisor:v1.3.0
restart: unless-stopped
ports:
- 7054:80
Expand All @@ -210,7 +210,7 @@ services:
- default

refinery-embedder:
image: kernai/refinery-embedder:latest
image: kernai/refinery-embedder:v1.3.0
restart: unless-stopped
ports:
- 7058:80
Expand All @@ -228,7 +228,7 @@ services:
- default

refinery-config:
image: kernai/refinery-config:latest
image: kernai/refinery-config:v1.2.0
restart: unless-stopped
ports:
- 7059:80
Expand All @@ -243,7 +243,7 @@ services:
refinery-doc-ock:
depends_on:
- refinery-config
image: kernai/refinery-doc-ock:latest
image: kernai/refinery-doc-ock:v1.2.0
restart: unless-stopped
ports:
- 7060:80
Expand All @@ -253,7 +253,7 @@ services:
- TELEMETRY_URI=https://telemetry.kern.ai

refinery-websocket:
image: kernai/refinery-websocket:latest
image: kernai/refinery-websocket:v1.2.0
restart: unless-stopped
environment:
- DB_DSN=postgresql://postgres:onetask@graphql-postgres:5432?sslmode=disable
Expand All @@ -265,7 +265,7 @@ services:
refinery-tokenizer:
depends_on:
- refinery-config
image: kernai/refinery-tokenizer:latest
image: kernai/refinery-tokenizer:v1.3.0
restart: unless-stopped
ports:
- 7061:80
Expand All @@ -282,7 +282,7 @@ services:
- default

refinery-updater:
image: kernai/refinery-updater:latest
image: kernai/refinery-updater:v1.3.0
restart: unless-stopped
ports:
- 7062:80
Expand All @@ -298,7 +298,7 @@ services:
- default

refinery-neural-search:
image: kernai/refinery-neural-search:latest
image: kernai/refinery-neural-search:v1.2.1
restart: unless-stopped
ports:
- 7063:80
Expand All @@ -311,7 +311,7 @@ services:
- default

refinery-zero-shot:
image: kernai/refinery-zero-shot:latest
image: kernai/refinery-zero-shot:v1.2.0
restart: unless-stopped
ports:
- 7064:80
Expand Down
18 changes: 10 additions & 8 deletions start
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ sed -i.bak -e "s|{LOCAL_VOLUME_QDRANT}|$LOCAL_VOLUME_QDRANT|g" refinery/docker-c
rm refinery/*.bak

#pull exec envs if not existent
if [[ "$(docker images -q kernai/refinery-ac-exec-env:latest 2> /dev/null)" == "" ]]; then
docker pull kernai/refinery-ac-exec-env:latest
if [[ "$(docker images -q kernai/refinery-ac-exec-env:v1.3.0 2> /dev/null)" == "" ]]; then
docker pull kernai/refinery-ac-exec-env:v1.3.0
fi
if [[ "$(docker images -q kernai/refinery-lf-exec-env:latest 2> /dev/null)" == "" ]]; then
docker pull kernai/refinery-lf-exec-env:latest
if [[ "$(docker images -q kernai/refinery-lf-exec-env:v1.2.0 2> /dev/null)" == "" ]]; then
docker pull kernai/refinery-lf-exec-env:v1.2.0
fi
if [[ "$(docker images -q kernai/refinery-ml-exec-env:latest 2> /dev/null)" == "" ]]; then
docker pull kernai/refinery-ml-exec-env:latest
if [[ "$(docker images -q kernai/refinery-ml-exec-env:v1.3.0 2> /dev/null)" == "" ]]; then
docker pull kernai/refinery-ml-exec-env:v1.3.0
fi
if [[ "$(docker images -q kernai/refinery-record-ide-env:latest 2> /dev/null)" == "" ]]; then
docker pull kernai/refinery-record-ide-env:latest
if [[ "$(docker images -q kernai/refinery-record-ide-env:v1.2.0 2> /dev/null)" == "" ]]; then
docker pull kernai/refinery-record-ide-env:v1.2.0
fi

if [ ! -f "./refinery/oathkeeper/jwks.json" ]; then
Expand All @@ -49,6 +49,8 @@ source alembic_fix

docker-compose -f refinery/docker-compose.yml up -d

sleep 5

echo "UI: http://localhost:4455/app/"
echo "Minio: $MINIO_ENDPOINT"
echo "MailHog: http://localhost:4436/"
17 changes: 9 additions & 8 deletions start.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@ powershell -Command "(gc refinery\docker-compose.yml) -replace '{LOCAL_VOLUME_PO
powershell -Command "(gc refinery\docker-compose.yml) -replace '{LOCAL_VOLUME_MINIO}', '%LOCAL_VOLUME_MINIO%' | Out-File -encoding ASCII refinery\docker-compose.yml"
powershell -Command "(gc refinery\docker-compose.yml) -replace '{LOCAL_VOLUME_QDRANT}', '%LOCAL_VOLUME_QDRANT%' | Out-File -encoding ASCII refinery\docker-compose.yml"

for /f "tokens=1" %%i in ('docker images kernai/refinery-ac-exec-env:latest') do (set image=%%i)
for /f "tokens=1" %%i in ('docker images kernai/refinery-ac-exec-env:v1.3.0') do (set image=%%i)
if "%image%" neq "kernai/refinery-ac-exec-env" (
docker pull kernai/refinery-ac-exec-env:latest
docker pull kernai/refinery-ac-exec-env:v1.3.0
)
for /f "tokens=1" %%i in ('docker images kernai/refinery-lf-exec-env:latest') do (set image=%%i)
for /f "tokens=1" %%i in ('docker images kernai/refinery-lf-exec-env:v1.2.0') do (set image=%%i)
if "%image%" neq "kernai/refinery-lf-exec-env" (
docker pull kernai/refinery-lf-exec-env:latest
docker pull kernai/refinery-lf-exec-env:v1.2.0
)
for /f "tokens=1" %%i in ('docker images kernai/refinery-ml-exec-env:latest') do (set image=%%i)
for /f "tokens=1" %%i in ('docker images kernai/refinery-ml-exec-env:v1.3.0') do (set image=%%i)
if "%image%" neq "kernai/refinery-ml-exec-env" (
docker pull kernai/refinery-ml-exec-env:latest
docker pull kernai/refinery-ml-exec-env:v1.3.0
)
for /f "tokens=1" %%i in ('docker images kernai/refinery-record-ide-env:latest') do (set image=%%i)
for /f "tokens=1" %%i in ('docker images kernai/refinery-record-ide-env:v1.2.0') do (set image=%%i)
if "%image%" neq "kernai/refinery-record-ide-env" (
docker pull kernai/refinery-record-ide-env:latest
docker pull kernai/refinery-record-ide-env:v1.2.0
)

IF NOT EXIST .\refinery\oathkeeper\jwks.json (
Expand All @@ -68,6 +68,7 @@ call alembic_fix.bat

docker-compose -f refinery\docker-compose.yml up -d

timeout 5 > nul

echo UI: http://localhost:4455/app/
echo Minio: %MINIO_ENDPOINT%
Expand Down
9 changes: 0 additions & 9 deletions update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,6 @@ else
echo "kern-refinery is not installed. Skipping update..."
fi

echo "Pulling newest images of exec envs..."
docker pull kernai/refinery-ac-exec-env:latest
docker pull kernai/refinery-lf-exec-env:latest
docker pull kernai/refinery-ml-exec-env:latest
docker pull kernai/refinery-record-ide-env:latest

echo "Pulling newest images of refinery..."
docker-compose -f refinery/docker-compose.yml pull

echo "Starting refinery containers..."
source start
sleep 10
Expand Down
10 changes: 0 additions & 10 deletions update.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,6 @@ if !ERRORLEVEL! == 0 (
echo kern-refinery is not installed. Skipping update...
)

echo Pulling newest images of exec envs...
docker pull kernai/refinery-ac-exec-env:latest
docker pull kernai/refinery-lf-exec-env:latest
docker pull kernai/refinery-ml-exec-env:latest
docker pull kernai/refinery-record-ide-env:latest

echo Pulling newest images of refinery...
docker-compose -f refinery\docker-compose.yml pull


echo Starting refinery containers...
call start.bat update
timeout /t 10 /nobreak > nul
Expand Down
3 changes: 2 additions & 1 deletion wait_until_db_ready
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ echo "Waiting for container to be ready..."
docker exec $CONTAINER pg_isready > /dev/null 2>&1
while [ $? -ne 0 ]
do
sleep 1
docker exec $CONTAINER pg_isready > /dev/null 2>&1
done

sleep 1
echo "db ready"
2 changes: 1 addition & 1 deletion wait_until_db_ready.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ IF %ERRORLEVEL% NEQ 0 (
timeout 1 > nul
goto RECHECK
)

timeout 1 > nul
echo db ready.