Merge branch 'next' into feat/enveloping_proof

uncefact · Jul 30, 2024 · 33f2e72 · 33f2e72
2 parents c37d301 + 3c359dc
commit 33f2e72
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -1,24 +1,26 @@
 name: package
 
 on:
-#  push:
-#    branches:
-#      - next
-#      - cd_*
-#    tags:
-#      - "v[0-9]+.[0-9]+.[0-9]+"
-#  pull_request:
-
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
   workflow_dispatch:
 
+env:
+  CI: false
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-
+      - name: node_setup
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.12.2
+
       - name: docker meta details
         id: meta
         uses: docker/metadata-action@v5
@@ -27,7 +29,7 @@ jobs:
           flavor: |
             latest=auto
           tags: |
-            type=latest,branch=main
+            type=edge,branch=next
             type=semver,pattern={{version}}
             type=sha
 
@@ -44,10 +46,10 @@ jobs:
       - name: Push Release
         uses: docker/build-push-action@v5
         with:
-          push: ${{ startsWith(github.ref, 'refs/tags/') }}
+          push: ${{ startsWith(github.ref, 'refs/tags/')  || github.ref == 'refs/heads/next' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          target: train_package
+          target: vckit-api
 #          build-args: |
 
 
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ COPY package.json .
 COPY pnpm-lock.yaml .
 COPY pnpm-workspace.yaml .
 COPY lerna.json .
-COPY agent.template.yml .
+COPY packages/cli/default/agent.template.yml .
 COPY entrypoint.sh .
 
 COPY packages/tsconfig.json packages/

diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ docker build -t vckit-api .
 
 You can customize the Docker image build process by specifying a custom configuration file path for the VCkit API.
 Ensure that you have the custom configuration file (`<config_path>`) ready. This file should contain the necessary settings and configurations for the VCkit API.
-Use the `--build-arg` flag to specify the `DATABASE_TYPE`, `DATABASE_USERNAME`, `DATABASE_PASSWORD`, `DATABASE_NAME`, `DATABASE_HOST`, `DATABASE_PORT`, `DATABASE_ENCRYPTION_KEY`, `PORT`, `PROTOCOL`, and `API_DOMAIN` build arguments when running the docker build command.
+Use the `--build-arg` flag to specify the `DATABASE_TYPE`, `DATABASE_USERNAME`, `DATABASE_PASSWORD`, `DATABASE_NAME`, `DATABASE_HOST`, `DATABASE_PORT`, `DATABASE_ENCRYPTION_KEY`, `PORT`, `PROTOCOL`, `API_DOMAIN`, and `API_KEY` build arguments when running the docker build command.
 
 ```bash
 docker build \
@@ -101,6 +101,7 @@ docker build \
   --build-arg PORT=3332 \
   --build-arg PROTOCOL=http \
   --build-arg API_DOMAIN=localhost:3332 \
+  --build-arg API_KEY=test123 \
   -t vckit-api .
 ```
 

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -3,7 +3,7 @@
 echo "Updating agent.yml with environment variables..."
 
 # Replace variables in the agent.yml file with the exported environment variables
-envsubst '${DATABASE_TYPE},${DATABASE_NAME},${DATABASE_HOST},${DATABASE_PORT},${DATABASE_USERNAME},${DATABASE_PASSWORD},${DATABASE_ENCRYPTION_KEY},${PORT},${PROTOCOL},${API_DOMAIN}' < /app/agent.template.yml > /app/agent.yml
+envsubst '${DATABASE_TYPE},${DATABASE_NAME},${DATABASE_HOST},${DATABASE_PORT},${DATABASE_USERNAME},${DATABASE_PASSWORD},${DATABASE_ENCRYPTION_KEY},${PORT},${PROTOCOL},${API_DOMAIN},${API_KEY}' < /app/agent.template.yml > /app/agent.yml
 
 echo "Agent.yml updated."
 

diff --git a/local.env b/local.env
@@ -7,4 +7,5 @@ DATABASE_PORT=5432
 DATABASE_ENCRYPTION_KEY=29739248cad1bd1a0fc4d9b75cd4d2990de535baf5caadfdf8d8f86664aa830c
 PORT=3332
 PROTOCOL=http
-API_DOMAIN=localhost:3332
+API_DOMAIN=localhost:3332
+API_KEY=test1234
diff --git a/packages/cli/default/agent.template.yml b/packages/cli/default/agent.template.yml
@@ -215,7 +215,7 @@ server:
     - - /agent
       - $require: '@vckit/remote-server?t=function#apiKeyAuth'
         $args:
-          - apiKey: test123
+          - apiKey: ${API_KEY}
 
       - $require: '@vckit/encrypted-storage?t=function#encryptedStoreMiddleware'
         $args: