Skip to content

Commit 0d48aba

Browse files
committed
Update alpine linux image
1 parent e26d7d3 commit 0d48aba

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

addon-build-configs/3.0.0/ember-cli-build.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,11 @@ module.exports = function() {
101101
});
102102

103103
var addonTree = concat(app._addonTree(), {
104+
inputFiles: '**/*.js',
104105
outputFile: 'vendor/addons.js'
105106
});
106107

107-
var fullTree = mergeTrees([app.appAndDependencies(), app.styles(), addonTree]);
108+
var fullTree = mergeTrees([app.appAndDependencies(), app.styles(), app._addonTree(), addonTree], { overwrite: true });
108109

109110
return mergeTrees([
110111
concat(fullTree, {

addon-build-configs/3.1.0/ember-cli-build.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,11 @@ module.exports = function() {
101101
});
102102

103103
var addonTree = concat(app.addonTree(), {
104+
inputFiles: '**/*.js',
104105
outputFile: 'vendor/addons.js'
105106
});
106107

107-
var fullTree = mergeTrees([app.appAndDependencies(), app.styles(), addonTree]);
108+
var fullTree = mergeTrees([app.appAndDependencies(), app.styles(), app.addonTree(), addonTree], { overwrite: true });
108109

109110
return mergeTrees([
110111
concat(fullTree, {

addon-build-configs/3.2.0/ember-cli-build.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,11 @@ module.exports = function() {
101101
});
102102

103103
var addonTree = concat(app.addonTree(), {
104+
inputFiles: '**/*.js',
104105
outputFile: 'vendor/addons.js'
105106
});
106107

107-
var fullTree = mergeTrees([app.appAndDependencies(), app.styles(), addonTree]);
108+
var fullTree = mergeTrees([app.appAndDependencies(), app.styles(), app.addonTree(), addonTree], { overwrite: true });
108109

109110
return mergeTrees([
110111
concat(fullTree, {

addon-builder/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM mhart/alpine-node:6.9.2
1+
FROM node:8-alpine
22

33
RUN apk --update add git
4-
RUN npm install -g bower@1.7.7
4+
RUN npm install -g bower
55

66
RUN mkdir /addon-builder
77
WORKDIR /addon-builder

addon-builder/ember-cli-build.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,11 @@ module.exports = function() {
101101
});
102102

103103
var addonTree = concat(app.addonTree(), {
104+
inputFiles: '**/*.js',
104105
outputFile: 'vendor/addons.js'
105106
});
106107

107-
var fullTree = mergeTrees([app.appAndDependencies(), app.styles(), addonTree]);
108+
var fullTree = mergeTrees([app.appAndDependencies(), app.styles(), app.addonTree(), addonTree], { overwrite: true });
108109

109110
return mergeTrees([
110111
concat(fullTree, {

0 commit comments

Comments
 (0)