diff --git a/.dockerignore b/.dockerignore index 0d0d4f0c6..3765648b1 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,3 @@ * !dist +!build diff --git a/README.md b/README.md index 56193adf7..9cade71eb 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![Docker Pulls](https://img.shields.io/docker/pulls/portainer/portainer.svg)](https://hub.docker.com/r/portainer/portainer/) [![Microbadger](https://images.microbadger.com/badges/image/portainer/portainer.svg)](http://microbadger.com/images/portainer/portainer "Image size") [![Documentation Status](https://readthedocs.org/projects/portainer/badge/?version=stable)](http://portainer.readthedocs.io/en/latest/?badge=stable) +[![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=portainer&repoName=portainer&branch=develop&pipelineName=portainer-ci&accountName=deviantony&type=cf-1)]( https://g.codefresh.io/repositories/portainer/portainer/builds?filter=trigger:build;branch:develop;service:5922a08a3a1aab000116fcc6~portainer-ci) [![Gitter](https://badges.gitter.im/portainer/Lobby.svg)](https://gitter.im/portainer/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YHXZJQNJQ36H6) diff --git a/api/portainer.go b/api/portainer.go index ff38b8b5a..c0315ecaf 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -252,7 +252,7 @@ type ( const ( // APIVersion is the version number of the Portainer API. - APIVersion = "1.13.0" + APIVersion = "1.13.1" // DBVersion is the version number of the Portainer database. DBVersion = 2 ) diff --git a/app/app.js b/app/app.js index 9cfa606fc..82fa21625 100644 --- a/app/app.js +++ b/app/app.js @@ -631,4 +631,4 @@ angular.module('portainer', [ .constant('ENDPOINTS_ENDPOINT', 'api/endpoints') .constant('TEMPLATES_ENDPOINT', 'api/templates') .constant('PAGINATION_MAX_ITEMS', 10) - .constant('UI_VERSION', 'v1.13.0'); + .constant('UI_VERSION', 'v1.13.1'); diff --git a/app/components/createService/createServiceController.js b/app/components/createService/createServiceController.js index 02924bf44..5ba874fb7 100644 --- a/app/components/createService/createServiceController.js +++ b/app/components/createService/createServiceController.js @@ -176,12 +176,7 @@ function ($scope, $state, Service, ServiceHelper, Volume, Network, ImageHelper, function prepareVolumes(config, input) { input.Volumes.forEach(function (volume) { if (volume.Source && volume.Target) { - var mount = {}; - mount.Type = volume.Bind ? 'bind' : 'volume'; - mount.ReadOnly = volume.ReadOnly ? true : false; - mount.Source = volume.Source; - mount.Target = volume.Target; - config.TaskTemplate.ContainerSpec.Mounts.push(mount); + config.TaskTemplate.ContainerSpec.Mounts.push(volume); } }); } diff --git a/app/components/task/task.html b/app/components/task/task.html index a657fa63d..16db1a274 100644 --- a/app/components/task/task.html +++ b/app/components/task/task.html @@ -22,6 +22,10 @@ State {{ task.Status.State }} + + State Message + {{ task.Status.Message }} + Error message {{ task.Status.Err }} diff --git a/app/components/templates/templates.html b/app/components/templates/templates.html index 4cadd180c..8b273388c 100644 --- a/app/components/templates/templates.html +++ b/app/components/templates/templates.html @@ -250,7 +250,7 @@
-
+
@@ -289,7 +289,7 @@
Loading...
-
+
No templates available.
diff --git a/app/components/templates/templatesController.js b/app/components/templates/templatesController.js index 57fb2515a..5ead966ac 100644 --- a/app/components/templates/templatesController.js +++ b/app/components/templates/templatesController.js @@ -5,7 +5,6 @@ function ($scope, $q, $state, $stateParams, $anchorScroll, $filter, Config, Cont selectedTemplate: null, showAdvancedOptions: false, hideDescriptions: $stateParams.hide_descriptions, - pagination_count: Pagination.getPaginationCount('templates'), formValidationError: '', filters: { Categories: '!', @@ -18,10 +17,6 @@ function ($scope, $q, $state, $stateParams, $anchorScroll, $filter, Config, Cont name: '' }; - $scope.changePaginationCount = function() { - Pagination.setPaginationCount('templates', $scope.state.pagination_count); - }; - $scope.addVolume = function () { $scope.state.selectedTemplate.Volumes.push({ containerPath: '', name: '', readOnly: false, type: 'auto' }); }; diff --git a/bower.json b/bower.json index 9bc5f84b7..e06c0615a 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "portainer", - "version": "1.13.0", + "version": "1.13.1", "homepage": "https://github.com/portainer/portainer", "authors": [ "Anthony Lapenna " diff --git a/codefresh.yml b/codefresh.yml new file mode 100644 index 000000000..25413098b --- /dev/null +++ b/codefresh.yml @@ -0,0 +1,36 @@ +version: '1.0' +steps: + + build_backend: + image: portainer/golang-builder:ci + working_directory: ${{main_clone}} + commands: + - mkdir -p /go/src/github.com/${{CF_REPO_OWNER}} + - ln -s /codefresh/volume/${{CF_REPO_NAME}}/api /go/src/github.com/${{CF_REPO_OWNER}}/${{CF_REPO_NAME}} + - /build.sh api/cmd/portainer + + build_frontend: + image: portainer/angular-builder:latest + working_directory: ${{build_backend}} + commands: + - npm install -g bower grunt grunt-cli && npm install + - bower install --allow-root + - grunt build-webapp + - mv api/cmd/portainer/portainer dist/ + + build_image: + type: build + working_directory: ${{build_frontend}} + dockerfile: ./build/linux/Dockerfile + image_name: portainer/portainer + tag: ${{CF_BRANCH}} + + push_image: + type: push + candidate: '${{build_image}}' + tag: '${{CF_BRANCH}}' + registry: dockerhub + when: + branch: + only: + - develop diff --git a/package.json b/package.json index 6f93e8a86..71c62f3ea 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Portainer.io", "name": "portainer", "homepage": "http://portainer.io", - "version": "1.13.0", + "version": "1.13.1", "repository": { "type": "git", "url": "git@github.com:portainer/portainer.git"