Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# generated dockerfiles
container/sagittarius/Dockerfile
container/sculptor/Dockerfile
container/velorum/Dockerfile

# downloaded projects
projects
18 changes: 18 additions & 0 deletions .gitlab/ci/container-boot.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,15 @@ container:boot:velorum:
needs:
- generate-environment
- manifest:velorum
parallel:
matrix:
- VELORUM_VARIANT:
- ce
- ee
- cloud
PLATFORM:
- amd64
- arm64
script:
- bundle install
- docker compose up velorum -d
Expand All @@ -169,6 +178,15 @@ container:boot:velorum:offline:
needs:
- generate-environment
- manifest:velorum
parallel:
matrix:
- VELORUM_VARIANT:
- ce
- ee
- cloud
PLATFORM:
- amd64
- arm64
script:
- docker compose up velorum-offline -d
- docker compose logs velorum-offline -f &
Expand Down
25 changes: 23 additions & 2 deletions .gitlab/ci/container-build.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -297,15 +297,36 @@ manifest:sculptor:

container:velorum:
extends:
- .single-image-build-base
- .variant-image-build-base
needs:
- generate-environment
variables:
NEED_PROJECT_DOWNLOAD: 'true'
parallel:
matrix:
- VARIANT:
- ce
- ee
- cloud
PLATFORM:
- amd64
- arm64

manifest:velorum:
extends:
- .manifest-create-base
parallel:
matrix:
- VARIANT:
- ce
- ee
- cloud
needs:
- generate-environment
- container:velorum
- job: container:velorum
parallel:
matrix:
- VARIANT: [ '$[[ matrix.VARIANT ]]' ]
PLATFORM:
- amd64
- arm64
10 changes: 10 additions & 0 deletions container/velorum/Dockerfile → container/velorum/Dockerfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ RUN uv run python -c "from src.model import load_vector_model; load_vector_model
COPY projects/velorum/few_shots.configuration.json ./few_shots.configuration.json
COPY projects/velorum/cli ./cli
COPY projects/velorum/src ./src

<% if ee? || cloud? %>
COPY projects/velorum/packages/ee ./packages/ee
<% end %>

<% if cloud? %>
COPY projects/velorum/packages/cloud ./packages/cloud
<% end %>

COPY projects/velorum/edition.py ./edition.py
COPY projects/velorum/main.py ./main.py

ENV HF_HUB_OFFLINE=1
Expand Down
19 changes: 19 additions & 0 deletions container/velorum/renderDockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env ruby

require 'erb'
require 'fileutils'

def ee?
ENV['VARIANT'].eql?('ee')
end

def cloud?
ENV['VARIANT'].eql?('cloud')
end

def variant
ENV['VARIANT']
end

template = ERB.new(File.read("#{__dir__}/Dockerfile.erb"), trim_mode: '-')
File.write("#{__dir__}/Dockerfile", template.result)
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ services:
- ide

velorum:
image: ${IMAGE_REGISTRY}/velorum:${IMAGE_TAG}
image: ${IMAGE_REGISTRY}/velorum:${IMAGE_TAG}-${IMAGE_EDITION}
depends_on:
config-generator:
condition: service_completed_successfully
Expand Down
4 changes: 2 additions & 2 deletions support/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ services:
- http://sculptor:3000/

velorum:
image: ghcr.io/code0-tech/reticulum/ci-builds/velorum:${RETICULUM_CONTAINER_VERSION}
image: ghcr.io/code0-tech/reticulum/ci-builds/velorum:${RETICULUM_CONTAINER_VERSION}-${VELORUM_VARIANT}
networks:
- boot
volumes:
Expand All @@ -146,7 +146,7 @@ services:
- "50052:50051"

velorum-offline:
image: ghcr.io/code0-tech/reticulum/ci-builds/velorum:${RETICULUM_CONTAINER_VERSION}
image: ghcr.io/code0-tech/reticulum/ci-builds/velorum:${RETICULUM_CONTAINER_VERSION}-${VELORUM_VARIANT}
network_mode: "none"
volumes:
- ./config/velorum.models.configuration.json:/velorum/models.configuration.json
Expand Down
2 changes: 1 addition & 1 deletion versions/velorum
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2161431976562194ee0b333a5ef9fc35d779246e
84709b7b3bf5202ffb6ffbcf8ef290a8b478d9ca