FILTER BY
All
Recommended
My Repos
+ My Images
diff --git a/src/stores/ImageStore.js b/src/stores/ImageStore.js
new file mode 100644
index 0000000000..397b3c3c7e
--- /dev/null
+++ b/src/stores/ImageStore.js
@@ -0,0 +1,59 @@
+import alt from '../alt';
+import imageActions from '../actions/ImageActions';
+import imageServerActions from '../actions/ImageServerActions';
+
+class ImageStore {
+ constructor () {
+ this.bindActions(imageActions);
+ this.bindActions(imageServerActions);
+ this.results = [];
+ this.images = [];
+ this.imagesLoading = false;
+ this.resultsLoading = false;
+ this.error = null;
+ }
+
+ error (error) {
+ this.setState({error: error, imagesLoading: false, resultsLoading: false});
+ }
+
+ clearError () {
+ this.setState({error: null});
+ }
+
+ destroyed (data) {
+ let images = this.images;
+ if ((data && data[1] && data[1].Deleted)) {
+ delete images[data[1].Deleted];
+ }
+ this.setState({error: null});
+ }
+
+ updated (images) {
+ let tags = {};
+ let finalImages = [];
+ images.map((image) => {
+ image.RepoTags.map(repoTags => {
+ let [name, tag] = repoTags.split(':');
+ if (typeof tags[name] !== 'undefined') {
+ finalImages[tags[name]].tags.push(tag);
+ if (image.inUse) {
+ finalImages[tags[name]].inUse = image.inUse;
+ }
+ } else {
+ image.tags = [tag];
+ tags[name] = finalImages.length;
+ finalImages.push(image);
+ }
+ });
+ });
+ this.setState({error: null, images: finalImages, imagesLoading: false});
+ }
+
+ static all () {
+ let state = this.getState();
+ return state.images;
+ }
+}
+
+export default alt.createStore(ImageStore);
diff --git a/src/stores/TagStore.js b/src/stores/TagStore.js
index 13a2b980cf..4ddb4c5a05 100644
--- a/src/stores/TagStore.js
+++ b/src/stores/TagStore.js
@@ -21,6 +21,15 @@ class TagStore {
this.emitChange();
}
+ localTags ({repo, tags}) {
+ let data = [];
+ tags.map((value) => {
+ data.push({'name': value});
+ });
+ this.loading[repo] = true;
+ this.tagsUpdated({repo, tags: data || []});
+ }
+
tagsUpdated ({repo, tags}) {
this.tags[repo] = tags;
this.loading[repo] = false;
diff --git a/src/utils/DockerUtil.js b/src/utils/DockerUtil.js
index f6b92f6feb..c61d00f8c5 100644
--- a/src/utils/DockerUtil.js
+++ b/src/utils/DockerUtil.js
@@ -8,20 +8,23 @@ import util from './Util';
import hubUtil from './HubUtil';
import metrics from '../utils/MetricsUtil';
import containerServerActions from '../actions/ContainerServerActions';
+import imageServerActions from '../actions/ImageServerActions';
+import Promise from 'bluebird';
import rimraf from 'rimraf';
import stream from 'stream';
import JSONStream from 'JSONStream';
-import Promise from 'bluebird';
-export default {
+var DockerUtil = {
host: null,
client: null,
placeholders: {},
stream: null,
eventStream: null,
activeContainerName: null,
+ localImages: null,
+ imagesUsed: [],
setup (ip, name) {
if (!ip && !name) {
@@ -76,7 +79,7 @@ export default {
init () {
this.placeholders = JSON.parse(localStorage.getItem('placeholders')) || {};
- this.fetchAllContainers();
+ this.refresh();
this.listen();
// Resume pulling containers that were previously being pulled
@@ -166,6 +169,7 @@ export default {
this.startContainer(name);
delete this.placeholders[name];
localStorage.setItem('placeholders', JSON.stringify(this.placeholders));
+ this.refresh();
});
});
});
@@ -189,12 +193,17 @@ export default {
console.error(err);
return;
}
+ this.imagesUsed = [];
async.map(containers, (container, callback) => {
this.client.getContainer(container.Id).inspect((error, container) => {
if (error) {
callback(null, null);
return;
}
+ let imgSha = container.Image.replace('sha256:', '');
+ if (_.indexOf(this.imagesUsed, imgSha) === -1) {
+ this.imagesUsed.push(imgSha);
+ }
container.Name = container.Name.replace('/', '');
callback(null, container);
});
@@ -206,11 +215,50 @@ export default {
return;
}
containerServerActions.allUpdated({containers: _.indexBy(containers.concat(_.values(this.placeholders)), 'Name')});
+ this.fetchAllImages();
});
});
},
- run (name, repository, tag) {
+ fetchAllImages () {
+ this.client.listImages((err, list) => {
+ if (err) {
+ imageServerActions.error(err);
+ } else {
+ list.map((image, idx) => {
+ let imgSha = image.Id.replace('sha256:', '');
+ if (_.indexOf(this.imagesUsed, imgSha) !== -1) {
+ list[idx].inUse = true;
+ } else {
+ list[idx].inUse = false;
+ }
+ });
+ this.localImages = list;
+ imageServerActions.updated(list);
+ }
+ });
+ },
+
+ removeImage (selectedRepoTag) {
+ this.localImages.some((image) => {
+ image.RepoTags.map(repoTag => {
+ if (repoTag === selectedRepoTag) {
+ this.client.getImage(selectedRepoTag).remove({'force': true}, (err, data) => {
+ if (err) {
+ console.error(err);
+ imageServerActions.error(err);
+ } else {
+ imageServerActions.destroyed(data);
+ this.refresh();
+ }
+ });
+ return true;
+ }
+ });
+ });
+ },
+
+ run (name, repository, tag, local = false) {
tag = tag || 'latest';
let imageName = repository + ':' + tag;
@@ -231,30 +279,34 @@ export default {
this.placeholders[name] = placeholderData;
localStorage.setItem('placeholders', JSON.stringify(this.placeholders));
-
- this.pullImage(repository, tag, error => {
- if (error) {
- containerServerActions.error({name, error});
- return;
- }
-
- if (!this.placeholders[name]) {
- return;
- }
-
+ if (local) {
this.createContainer(name, {Image: imageName, Tty: true, OpenStdin: true});
- },
+ } else {
+ this.pullImage(repository, tag, error => {
+ if (error) {
+ containerServerActions.error({name, error});
+ this.refresh();
+ return;
+ }
- // progress is actually the progression PER LAYER (combined in columns)
- // not total because it's not accurate enough
- progress => {
- containerServerActions.progress({name, progress});
- },
+ if (!this.placeholders[name]) {
+ return;
+ }
+
+ this.createContainer(name, {Image: imageName, Tty: true, OpenStdin: true});
+ },
+
+ // progress is actually the progression PER LAYER (combined in columns)
+ // not total because it's not accurate enough
+ progress => {
+ containerServerActions.progress({name, progress});
+ },
- () => {
- containerServerActions.waiting({name, waiting: true});
- });
+ () => {
+ containerServerActions.waiting({name, waiting: true});
+ });
+ }
},
updateContainer (name, data) {
@@ -262,6 +314,7 @@ export default {
existing.inspect((error, existingData) => {
if (error) {
containerServerActions.error({name, error});
+ this.refresh();
return;
}
@@ -298,6 +351,7 @@ export default {
if (error) {
// TODO: handle error
containerServerActions.error({newName, error});
+ this.refresh();
}
rimraf(newPath, () => {
if (fs.existsSync(oldPath)) {
@@ -319,11 +373,13 @@ export default {
this.client.getContainer(name).stop({t: 5}, stopError => {
if (stopError && stopError.statusCode !== 304) {
containerServerActions.error({name, stopError});
+ this.refresh();
return;
}
this.client.getContainer(name).start(startError => {
if (startError && startError.statusCode !== 304) {
containerServerActions.error({name, startError});
+ this.refresh();
return;
}
this.fetchContainer(name);
@@ -335,6 +391,7 @@ export default {
this.client.getContainer(name).stop({t: 5}, error => {
if (error && error.statusCode !== 304) {
containerServerActions.error({name, error});
+ this.refresh();
return;
}
this.fetchContainer(name);
@@ -345,6 +402,7 @@ export default {
this.client.getContainer(name).start(error => {
if (error && error.statusCode !== 304) {
containerServerActions.error({name, error});
+ this.refresh();
return;
}
this.fetchContainer(name);
@@ -356,15 +414,17 @@ export default {
containerServerActions.destroyed({id: name});
delete this.placeholders[name];
localStorage.setItem('placeholders', JSON.stringify(this.placeholders));
+ this.refresh();
return;
}
let container = this.client.getContainer(name);
- container.unpause(function () {
- container.kill(function () {
- container.remove(function (error) {
+ container.unpause( () => {
+ container.kill( () => {
+ container.remove( (error) => {
if (error) {
containerServerActions.error({name, error});
+ this.refresh();
return;
}
containerServerActions.destroyed({id: name});
@@ -372,6 +432,7 @@ export default {
if (fs.existsSync(volumePath)) {
rimraf(volumePath, () => {});
}
+ this.refresh();
});
});
});
@@ -474,9 +535,11 @@ export default {
}
stream.setEncoding('utf8');
- stream.pipe(JSONStream.parse()).on('data', data => {
- if (data.status === 'pull' || data.status === 'untag' || data.status === 'delete' || data.status === 'attach') {
- return;
+ stream.on('data', json => {
+ let data = JSON.parse(json);
+
+ if (data.status === 'pull' || data.status === 'untag' || data.status === 'delete' || data.status === 'attach') {
+ this.refresh();
}
if (data.status === 'destroy') {
@@ -519,6 +582,7 @@ export default {
this.client.pull(repository + ':' + tag, opts, (err, stream) => {
if (err) {
+ console.log('Err: %o', err);
callback(err);
return;
}
@@ -563,7 +627,7 @@ export default {
if (i < leftOverLayers) {
layerAmount += 1;
}
- columns.progress[i] = {layerIDs: [], nbLayers:0 , maxLayers: layerAmount, value: 0.0};
+ columns.progress[i] = {layerIDs: [], nbLayers: 0, maxLayers: layerAmount, value: 0.0};
}
}
@@ -615,5 +679,11 @@ export default {
callback(error);
});
});
+ },
+
+ refresh () {
+ this.fetchAllContainers();
}
};
+
+module.exports = DockerUtil;
diff --git a/styles/new-container.less b/styles/new-container.less
index 7ca9247a3d..8885123910 100644
--- a/styles/new-container.less
+++ b/styles/new-container.less
@@ -67,6 +67,10 @@
justify-content: center;
flex-shrink: 0;
+ .error {
+ color: red;
+ }
+
img {
width: 380px;
}
@@ -160,6 +164,11 @@
font-weight: 500;
margin-right: 0.7rem;
}
+ .results-userimages {
+ border-left: 1px solid @gray-lighter;
+ padding-left: 1.2rem;
+ padding-right: 1.2rem;
+ }
}
}
}
@@ -227,6 +236,31 @@
bottom: 1rem;
right: 1rem;
}
+ .remove {
+ display: flex;
+ flex: 1 auto;
+ justify-content: center;
+ margin: 0.8rem 0 0 0;
+ a {
+ display: block;
+ text-decoration: none;
+ cursor: default;
+ &:focus {
+ outline: 0;
+ }
+ &.active {
+ .btn-delete {
+ opacity: 0.3;
+ }
+ }
+ }
+ }
+ .small {
+ color: red;
+ text-align: center;
+ padding-top: 5px;
+ font-size: 75%;
+ }
}
.tag-overlay {
z-index: 1000;