@wocker/ws 1.1.0 → 1.1.1
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.
|
@@ -97,27 +97,6 @@ let PresetListener = class PresetListener {
|
|
|
97
97
|
await this.dockerService.imageRm(imageName);
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
|
-
async onBeforeStart(project) {
|
|
101
|
-
if (project.type !== core_1.ProjectType.PRESET) {
|
|
102
|
-
return;
|
|
103
|
-
}
|
|
104
|
-
const preset = this.presetService.get(project.preset);
|
|
105
|
-
if (preset.dockerfile) {
|
|
106
|
-
project.imageName = this.presetService.getImageNameForProject(project, preset);
|
|
107
|
-
if (!await this.dockerService.imageExists(project.imageName)) {
|
|
108
|
-
await this.dockerService.buildImage({
|
|
109
|
-
version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
|
|
110
|
-
tag: project.imageName,
|
|
111
|
-
labels: {
|
|
112
|
-
presetName: preset.name
|
|
113
|
-
},
|
|
114
|
-
buildArgs: project.buildArgs,
|
|
115
|
-
context: preset.path,
|
|
116
|
-
dockerfile: preset.dockerfile
|
|
117
|
-
});
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
100
|
};
|
|
122
101
|
exports.PresetListener = PresetListener;
|
|
123
102
|
__decorate([
|
|
@@ -132,12 +111,6 @@ __decorate([
|
|
|
132
111
|
__metadata("design:paramtypes", [core_1.Project]),
|
|
133
112
|
__metadata("design:returntype", Promise)
|
|
134
113
|
], PresetListener.prototype, "onRebuild", null);
|
|
135
|
-
__decorate([
|
|
136
|
-
(0, core_1.Event)("project:beforeStart"),
|
|
137
|
-
__metadata("design:type", Function),
|
|
138
|
-
__metadata("design:paramtypes", [core_1.Project]),
|
|
139
|
-
__metadata("design:returntype", Promise)
|
|
140
|
-
], PresetListener.prototype, "onBeforeStart", null);
|
|
141
114
|
exports.PresetListener = PresetListener = __decorate([
|
|
142
115
|
(0, core_1.Controller)(),
|
|
143
116
|
__metadata("design:paramtypes", [core_1.AppService,
|
|
@@ -70,7 +70,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
|
|
|
70
70
|
if (!container) {
|
|
71
71
|
container = await this.dockerService.createContainer({
|
|
72
72
|
name: project.containerName,
|
|
73
|
-
image: project.
|
|
73
|
+
image: project.image,
|
|
74
74
|
cmd: project.cmd,
|
|
75
75
|
env: {
|
|
76
76
|
...this.appService.config.env || {},
|
|
@@ -139,18 +139,18 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
|
|
|
139
139
|
async build(project, rebuild) {
|
|
140
140
|
switch (project.type) {
|
|
141
141
|
case core_1.ProjectType.IMAGE:
|
|
142
|
-
await this.dockerService.pullImage(project.
|
|
142
|
+
await this.dockerService.pullImage(project.image);
|
|
143
143
|
break;
|
|
144
144
|
case core_1.ProjectType.DOCKERFILE: {
|
|
145
|
-
project.
|
|
145
|
+
project.image = `project-${project.name}:develop`;
|
|
146
146
|
project.save();
|
|
147
147
|
if (rebuild) {
|
|
148
|
-
await this.dockerService.imageRm(project.
|
|
148
|
+
await this.dockerService.imageRm(project.image);
|
|
149
149
|
}
|
|
150
|
-
if (!await this.dockerService.imageExists(project.
|
|
150
|
+
if (!await this.dockerService.imageExists(project.image)) {
|
|
151
151
|
await this.dockerService.buildImage({
|
|
152
152
|
version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
|
|
153
|
-
tag: project.
|
|
153
|
+
tag: project.image,
|
|
154
154
|
buildArgs: project.buildArgs,
|
|
155
155
|
context: project.path,
|
|
156
156
|
dockerfile: project.dockerfile
|
|
@@ -164,19 +164,19 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
|
|
|
164
164
|
});
|
|
165
165
|
if (preset.image) {
|
|
166
166
|
await this.dockerService.pullImage(preset.image);
|
|
167
|
-
project.
|
|
167
|
+
project.image = preset.image;
|
|
168
168
|
project.save();
|
|
169
169
|
}
|
|
170
170
|
if (preset.dockerfile) {
|
|
171
|
-
project.
|
|
171
|
+
project.image = this.presetService.getImageNameForProject(project, preset);
|
|
172
172
|
project.save();
|
|
173
173
|
if (rebuild) {
|
|
174
|
-
await this.dockerService.imageRm(project.
|
|
174
|
+
await this.dockerService.imageRm(project.image);
|
|
175
175
|
}
|
|
176
|
-
if (!await this.dockerService.imageExists(project.
|
|
176
|
+
if (!await this.dockerService.imageExists(project.image)) {
|
|
177
177
|
await this.dockerService.buildImage({
|
|
178
178
|
version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
|
|
179
|
-
tag: project.
|
|
179
|
+
tag: project.image,
|
|
180
180
|
labels: {
|
|
181
181
|
"org.wocker.preset": preset.name
|
|
182
182
|
},
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wocker/ws",
|
|
3
3
|
"type": "commonjs",
|
|
4
|
-
"version": "1.1.
|
|
4
|
+
"version": "1.1.1",
|
|
5
5
|
"author": "Kris Papercut <krispcut@gmail.com>",
|
|
6
6
|
"description": "Docker workspace for web projects",
|
|
7
7
|
"license": "MIT",
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
"make-coverage-badge": "make-coverage-badge"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@wocker/core": "1.1.
|
|
39
|
-
"@wocker/docker-module": "^1.0.
|
|
38
|
+
"@wocker/core": "1.1.1",
|
|
39
|
+
"@wocker/docker-module": "^1.0.1",
|
|
40
40
|
"@wocker/prompts": "^1.0.0",
|
|
41
41
|
"@wocker/utils": "^2.0.6",
|
|
42
42
|
"async-mutex": "^0.4.0",
|
|
@@ -49,8 +49,8 @@
|
|
|
49
49
|
"@types/jest": "^30.0.0",
|
|
50
50
|
"@types/node": "^24.5.2",
|
|
51
51
|
"@types/unzipper": "^0.10.10",
|
|
52
|
-
"@wocker/docker-mock-module": "^1.0.
|
|
53
|
-
"@wocker/testing": "^1.0.
|
|
52
|
+
"@wocker/docker-mock-module": "^1.0.1",
|
|
53
|
+
"@wocker/testing": "^1.0.9",
|
|
54
54
|
"jest": "^30.1.3",
|
|
55
55
|
"make-coverage-badge": "^1.2.0",
|
|
56
56
|
"memfs": "^4.49.0",
|