@toa.io/operations 0.20.0-dev.11 → 0.20.0-dev.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/operations",
-  "version": "0.20.0-dev.11",
+  "version": "0.20.0-dev.13",
   "description": "Toa Deployment",
   "homepage": "https://toa.io",
   "author": {
@@ -26,10 +26,10 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/filesystem": "0.20.0-dev.11",
-    "@toa.io/generic": "0.20.0-dev.11",
-    "@toa.io/yaml": "0.20.0-dev.11",
+    "@toa.io/filesystem": "0.20.0-dev.13",
+    "@toa.io/generic": "0.20.0-dev.13",
+    "@toa.io/yaml": "0.20.0-dev.13",
     "execa": "5.1.1"
   },
-  "gitHead": "8ccc0289a7af2dfb7fabf615f0a71bc8adf41b1c"
+  "gitHead": "73a02a4a471d9c62d2437df1065fc037b7eb7279"
 }

package/readme.md

@@ -11,8 +11,8 @@
 
 registry:
   build:
-    arguments: [NPM_TOKEN]
-    run: echo //npm.pkg.github.com/:_authToken=${NPM_TOKEN} > .npmrc
+    arguments: [GITHUB_TOKEN]
+    run: npm config set //npm.pkg.github.com/:_authToken ${GITHUB_TOKEN}
 ```
 
 `arguments` is a list of environemt varialbes to be passed to `docker build`.
@@ -28,3 +28,15 @@ registry:
       echo test > .test
       rm .test
 ```
+
+#### Registry Credentials
+
+When using private container registry,
+a secret containing required credentials can be specified using `registry.credentials` option.
+
+```yaml
+# context.toa.yaml
+
+registry:
+  credentials: docker-credentials-secret-name
+```

package/src/deployment/.deployment/describe.js

@@ -14,6 +14,7 @@ const describe = (context, compositions, dependency) => {
   const components = get.components(compositions)
   const dependencies = get.dependencies(references)
   const variables = get.variables(context, dependency.variables)
+  const credentials = context.registry.credentials
 
   return {
     compositions,
@@ -21,6 +22,7 @@ const describe = (context, compositions, dependency) => {
     services,
     proxies,
     variables,
+    credentials,
     ...dependencies
   }
 }

package/src/deployment/chart/templates/compositions.yaml

@@ -34,5 +34,9 @@ spec:
             {{- include "env.var" . | indent 12 }}
             {{- end }}
           {{- end }}
+      {{- if $.Values.credentials }}
+      imagePullSecrets:
+        - name: {{ $.Values.credentials }}
+      {{- end }}
 ---
 {{- end }}

package/src/deployment/chart/values.yaml

@@ -45,3 +45,4 @@ proxies:
   - name: storage-proxy
     target: host.docker.internal
 environment: development
+credentials: docker-credentials

package/src/deployment/images/composition.Dockerfile

@@ -3,8 +3,8 @@ FROM node:18.16.0-alpine3.17
 {{build.arguments}}
 
 ENV NODE_ENV=production
-RUN if [ {{runtime.registry}} != undefined ]; then npm set registry {{runtime.registry}}; fi
-RUN if [ {{runtime.proxy}} != undefined ]; then npm set proxy {{runtime.proxy}}; fi
+RUN if [ "{{runtime.registry}}" != "" ]; then npm set registry {{runtime.registry}}; fi
+RUN if [ "{{runtime.proxy}}" != "" ]; then npm set proxy {{runtime.proxy}}; fi
 RUN npm i -g @toa.io/runtime@{{runtime.version}} --omit=dev
 
 WORKDIR /composition
@@ -13,7 +13,7 @@ COPY --chown=node:node . /composition
 {{build.run}}
 
 # run 'npm i' in each component
-RUN find . -maxdepth 1 -type d \( ! -name . \) -exec /bin/sh -c "cd '{}' && if [ -f package.json ]; then npm i --omit=dev; fi" \;
+RUN for entry in *; do if [ -f "$entry/package.json" ]; then (cd $entry && npm i --omit=dev); fi; done
 
 USER node
 CMD toa compose *

package/src/deployment/images/service.Dockerfile

@@ -1,8 +1,8 @@
 FROM node:18.16.0-alpine3.17
 
 ENV NODE_ENV=production
-RUN if [ {{runtime.registry}} != undefined ]; then npm set registry {{runtime.registry}}; fi
-RUN if [ {{runtime.proxy}} != undefined ]; then npm set proxy {{runtime.proxy}}; fi
+RUN if [ "{{runtime.registry}}" != "" ]; then npm set registry {{runtime.registry}}; fi
+RUN if [ "{{runtime.proxy}}" != "" ]; then npm set proxy {{runtime.proxy}}; fi
 RUN npm i -g @toa.io/runtime@{{runtime.version}} --omit=dev
 
 WORKDIR /service