@travetto/pack 3.4.6 → 3.4.7

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@travetto/pack",
3
- "version": "3.4.6",
3
+ "version": "3.4.7",
4
4
  "description": "Code packing utilities",
5
5
  "keywords": [
6
6
  "travetto",
@@ -32,7 +32,7 @@
32
32
  "rollup": "^4.5.0"
33
33
  },
34
34
  "peerDependencies": {
35
- "@travetto/cli": "^3.4.4"
35
+ "@travetto/cli": "^3.4.5"
36
36
  },
37
37
  "peerDependenciesMeta": {
38
38
  "@travetto/cli": {
@@ -32,18 +32,16 @@ export class PackConfigUtil {
32
32
  `groupadd --gid ${gid} ${group} && useradd -u ${uid} -g ${group} ${user}`,
33
33
  `addgroup -g ${gid} ${group} && adduser -D -G ${group} -u ${uid} ${user}`
34
34
  ) : '',
35
- `USER ${user}`,
36
35
  ].join('\n');
37
36
  }
38
37
 
39
38
  /**
40
- * Common docker runtime folder
39
+ * Setup docker runtime folder
41
40
  */
42
41
  static dockerAppFolder(cfg: DockerPackConfig): string {
43
42
  const { folder, user, group } = cfg.dockerRuntime;
44
43
  return [
45
44
  `RUN mkdir ${folder} && chown ${user}:${group} ${folder}`,
46
- `WORKDIR ${folder}`,
47
45
  ].join('\n');
48
46
  }
49
47
 
@@ -51,15 +49,20 @@ export class PackConfigUtil {
51
49
  * Docker app files copied and permissioned
52
50
  */
53
51
  static dockerAppFiles(cfg: DockerPackConfig): string {
54
- const { user, group } = cfg.dockerRuntime;
55
- return `COPY --chown="${user}:${group}" . .`;
52
+ const { user, group, folder } = cfg.dockerRuntime;
53
+ return `COPY --chown="${user}:${group}" . ${folder}`;
56
54
  }
57
55
 
58
56
  /**
59
57
  * Entrypoint creation for a docker configuration
60
58
  */
61
59
  static dockerEntrypoint(cfg: DockerPackConfig): string {
62
- return `ENTRYPOINT ["${cfg.dockerRuntime.folder}/${cfg.mainName}.sh"]`;
60
+ const { user, folder } = cfg.dockerRuntime;
61
+ return [
62
+ `USER ${user}`,
63
+ `WORKDIR ${folder}`,
64
+ `ENTRYPOINT ["${folder}/${cfg.mainName}.sh"]`,
65
+ ].join('\n');
63
66
  }
64
67
  /**
65
68
  * Common docker environment setup