Put init scripts into workspace container

Signed-off-by: Anna Khismatullina <[email protected]>

.github/workflows/main.yml

@@ -42,6 +42,7 @@ env:
     tools
   PublishTempFolder: publish_artifacts
   MODEL_VERSION_MODE: ${{ startsWith(github.ref, 'refs/tags/s') && 'tagTime' || 'file' }}
+  INIT_SCRIPTS_BRANCH: 'unified-init-scripts'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -493,6 +494,14 @@ jobs:
         with:
           fetch-depth: 0
           filter: tree:0
+
+      - name: Checkout init repository
+        run: |
+          wget https://github.com/hcengineering/init/archive/refs/heads/${{env.INIT_SCRIPTS_BRANCH}}.zip
+          unzip ${{env.INIT_SCRIPTS_BRANCH}}.zip -d pods/workspace
+          mv pods/workspace/init-${{env.INIT_SCRIPTS_BRANCH}} pods/workspace/init
+          rm -rf ${{env.INIT_SCRIPTS_BRANCH}}.zip
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'

dev/.env

@@ -1,4 +1,3 @@
 STORAGE_CONFIG="minio|minio?accessKey=minioadmin&secretKey=minioadmin"
 MONGO_URL=mongodb://mongodb:27017?compressors=snappy
 DB_URL_PG=postgresql://postgres:example@postgres:5432
-WS_INIT_SCRIPTS=../../init

dev/docker-compose.yaml

@@ -125,7 +125,6 @@ services:
       - stats
     volumes:
       - ./branding.json:/var/cfg/branding.json
-      - ${WS_INIT_SCRIPTS}:/init-scripts
     environment:
       # - WS_OPERATION=create
       - SERVER_SECRET=secret
@@ -139,7 +138,6 @@ services:
       - ACCOUNTS_URL=http://host.docker.internal:3000
       - BRANDING_PATH=/var/cfg/branding.json
       # - PARALLEL=2
-      - INIT_REPO_DIR=/init-scripts
       - INIT_WORKSPACE=test
     restart: unless-stopped
   workspacepg:
@@ -152,7 +150,6 @@ services:
       - stats
     volumes:
       - ./branding.json:/var/cfg/branding.json
-      - ${WS_INIT_SCRIPTS}:/init-scripts
     environment:
       # - WS_OPERATION=create
       - SERVER_SECRET=secret
@@ -166,7 +163,6 @@ services:
       - MODEL_ENABLED=*
       - ACCOUNTS_URL=http://host.docker.internal:3000
       - BRANDING_PATH=/var/cfg/branding.json
-      - INIT_REPO_DIR=/init-scripts
       # - PARALLEL=2
       # - INIT_WORKSPACE=onboarding
     restart: unless-stopped    
@@ -180,7 +176,6 @@ services:
       - stats
     volumes:
       - ./branding.json:/var/cfg/branding.json
-      - ${WS_INIT_SCRIPTS}:/init-scripts
     environment:
       # - WS_OPERATION=create
       - SERVER_SECRET=secret
@@ -193,7 +188,6 @@ services:
       - MODEL_ENABLED=*
       - ACCOUNTS_URL=http://host.docker.internal:3000
       - BRANDING_PATH=/var/cfg/branding.json
-      - INIT_REPO_DIR=/init-scripts
       # - PARALLEL=2
       # - INIT_WORKSPACE=onboarding
     restart: unless-stopped        

pods/workspace/Dockerfile

@@ -14,4 +14,7 @@ ENV MALLOC_CONF=dirty_decay_ms:1000,narenas:2,background_thread:true
 COPY bundle/bundle.js ./
 COPY bundle/bundle.js.map ./
 
+COPY ini[t]/ ./init-scripts/
+
 CMD [ "node", "bundle.js" ]
+

server/workspace-service/src/index.ts

@@ -83,10 +83,8 @@ export function serveWorkspaceAccount (
     setMetadata(toolPlugin.metadata.InitWorkspace, initWS)
   }
 
-  const initRepoDir = process.env.INIT_REPO_DIR
-  if (initRepoDir !== undefined) {
-    setMetadata(toolPlugin.metadata.InitRepoDir, initRepoDir)
-  }
+  const initRepoDir = process.env.INIT_REPO_DIR ?? './init-scripts'
+  setMetadata(toolPlugin.metadata.InitRepoDir, initRepoDir)
 
   setMetadata(serverClientPlugin.metadata.UserAgent, 'WorkspaceService')
   setMetadata(serverNotification.metadata.InboxOnlyNotifications, true)