polyci 0.0.18 → 0.0.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +7 -5
- package/package.json +1 -1
package/dist/main.js
CHANGED
|
@@ -139,7 +139,7 @@ function appendGlobalVariables(lines) {
|
|
|
139
139
|
lines.push(` IMAGE_GIT: alpine/git:latest`);
|
|
140
140
|
lines.push(` IMAGE_NGINX: nginx:alpine-slim`);
|
|
141
141
|
lines.push(` IMAGE_DOCKER: docker:latest`);
|
|
142
|
-
lines.push(` IMAGE_COMPOSE: docker:
|
|
142
|
+
lines.push(` IMAGE_COMPOSE: docker:cli`);
|
|
143
143
|
lines.push(` GIT_PACKAGE: git`);
|
|
144
144
|
lines.push(` GIT_STRATEGY: clone`); //this prevents the stale tags in the ci job.
|
|
145
145
|
lines.push(``);
|
|
@@ -251,7 +251,7 @@ function appendGlobalReleaseJob(lines, modules, mainBranch, tagTemplate, branchT
|
|
|
251
251
|
}
|
|
252
252
|
lines.push(` image: $IMAGE_NODE`);
|
|
253
253
|
lines.push(` variables:`);
|
|
254
|
-
lines.push(` GITLAB_TOKEN: $
|
|
254
|
+
lines.push(` GITLAB_TOKEN: $POLYCI_TOKEN # Used to push release commits/tags.`);
|
|
255
255
|
lines.push(` script:`);
|
|
256
256
|
lines.push(` - apk update`);
|
|
257
257
|
lines.push(` - apk add $GIT_PACKAGE`);
|
|
@@ -336,8 +336,8 @@ function appendModulePublishJob(lines, module) {
|
|
|
336
336
|
lines.push(` - docker build --tag $CI_REGISTRY_IMAGE/$MODULE_NAME:v$INSTANCE_VERSION .`);
|
|
337
337
|
lines.push(` - docker push $CI_REGISTRY_IMAGE/$MODULE_NAME:v$INSTANCE_VERSION`);
|
|
338
338
|
lines.push(` artifacts:`);
|
|
339
|
-
lines.push(`
|
|
340
|
-
lines.push(`
|
|
339
|
+
lines.push(` paths:`);
|
|
340
|
+
lines.push(` - $MODULE_PATH/deploy.env`);
|
|
341
341
|
lines.push(` expire_in: 1 day`);
|
|
342
342
|
lines.push(``);
|
|
343
343
|
}
|
|
@@ -355,7 +355,8 @@ function appendModuleDeployJob(lines, module) {
|
|
|
355
355
|
lines.push(` MODULE_PATH: ${module.modulePath}`);
|
|
356
356
|
lines.push(` MODULE_TYPE: ${module.moduleType}`);
|
|
357
357
|
lines.push(` script:`);
|
|
358
|
-
lines.push(` -
|
|
358
|
+
lines.push(` - source $MODULE_PATH/deploy.env`);
|
|
359
|
+
lines.push(` - apk add --update --no-cache openssh-client-default`);
|
|
359
360
|
lines.push(` - eval $(ssh-agent -s)`);
|
|
360
361
|
lines.push(` - echo "$DEPLOY_USER_KEY" | tr -d '\\r' | ssh-add -`);
|
|
361
362
|
lines.push(` - mkdir -p ~/.ssh`);
|
|
@@ -366,6 +367,7 @@ function appendModuleDeployJob(lines, module) {
|
|
|
366
367
|
lines.push(` - docker context create remote --docker "host=ssh://$DEPLOY_USER@$DEPLOY_ADDRESS:$DEPLOY_PORT"`);
|
|
367
368
|
// lines.push(` - docker context use remote`);
|
|
368
369
|
lines.push(` - cd ci`);
|
|
370
|
+
lines.push(` - export DOCKER_API_VERSION=1.41`);
|
|
369
371
|
lines.push(` - docker --context remote compose -p $INSTANCE_CONTAINER down --remove-orphans`);
|
|
370
372
|
lines.push(` - docker --context remote compose pull`);
|
|
371
373
|
lines.push(` - docker --context remote compose -p $INSTANCE_CONTAINER up -d`);
|