- {{ extension.Enabled ? 'Enabled' : extension.Price }}
+ Enabled
+ Expired
+ {{ extension.Price }}
diff --git a/app/portainer/views/home/homeController.js b/app/portainer/views/home/homeController.js
index f25e5b51f..aef6f23d7 100644
--- a/app/portainer/views/home/homeController.js
+++ b/app/portainer/views/home/homeController.js
@@ -1,139 +1,139 @@
angular.module('portainer.app')
-.controller('HomeController', ['$q', '$scope', '$state', 'Authentication', 'EndpointService', 'EndpointHelper', 'GroupService', 'Notifications', 'EndpointProvider', 'StateManager', 'LegacyExtensionManager', 'ModalService', 'MotdService', 'SystemService',
-function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, GroupService, Notifications, EndpointProvider, StateManager, LegacyExtensionManager, ModalService, MotdService, SystemService) {
+ .controller('HomeController', ['$q', '$scope', '$state', 'Authentication', 'EndpointService', 'EndpointHelper', 'GroupService', 'Notifications', 'EndpointProvider', 'StateManager', 'LegacyExtensionManager', 'ModalService', 'MotdService', 'SystemService',
+ function($q, $scope, $state, Authentication, EndpointService, EndpointHelper, GroupService, Notifications, EndpointProvider, StateManager, LegacyExtensionManager, ModalService, MotdService, SystemService) {
- $scope.goToEdit = function(id) {
- $state.go('portainer.endpoints.endpoint', { id: id });
- };
+ $scope.goToEdit = function(id) {
+ $state.go('portainer.endpoints.endpoint', { id: id });
+ };
- $scope.goToDashboard = function (endpoint) {
- if (endpoint.Type === 3) {
- return switchToAzureEndpoint(endpoint);
- }
+ $scope.goToDashboard = function(endpoint) {
+ if (endpoint.Type === 3) {
+ return switchToAzureEndpoint(endpoint);
+ }
- checkEndpointStatus(endpoint)
- .then(function sucess() {
- return switchToDockerEndpoint(endpoint);
- }).catch(function error(err) {
- Notifications.error('Failure', err, 'Unable to verify endpoint status');
- });
- };
+ checkEndpointStatus(endpoint)
+ .then(function sucess() {
+ return switchToDockerEndpoint(endpoint);
+ }).catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to verify endpoint status');
+ });
+ };
- $scope.dismissImportantInformation = function (hash) {
- StateManager.dismissImportantInformation(hash);
- };
+ $scope.dismissImportantInformation = function(hash) {
+ StateManager.dismissImportantInformation(hash);
+ };
- $scope.dismissInformationPanel = function (id) {
- StateManager.dismissInformationPanel(id);
- };
+ $scope.dismissInformationPanel = function(id) {
+ StateManager.dismissInformationPanel(id);
+ };
- $scope.triggerSnapshot = function () {
- ModalService.confirmEndpointSnapshot(function (result) {
- if (!result) {
- return;
- }
- triggerSnapshot();
- });
- };
+ $scope.triggerSnapshot = function() {
+ ModalService.confirmEndpointSnapshot(function(result) {
+ if (!result) {
+ return;
+ }
+ triggerSnapshot();
+ });
+ };
- function checkEndpointStatus(endpoint) {
- var deferred = $q.defer();
+ function checkEndpointStatus(endpoint) {
+ var deferred = $q.defer();
+
+ var status = 1;
+ SystemService.ping(endpoint.Id)
+ .then(function sucess() {
+ status = 1;
+ }).catch(function error() {
+ status = 2;
+ }).finally(function() {
+ if (endpoint.Status === status) {
+ deferred.resolve(endpoint);
+ return deferred.promise;
+ }
+
+ EndpointService.updateEndpoint(endpoint.Id, { Status: status })
+ .then(function sucess() {
+ deferred.resolve(endpoint);
+ }).catch(function error(err) {
+ deferred.reject({ msg: 'Unable to update endpoint status', err: err });
+ });
+ });
- var status = 1;
- SystemService.ping(endpoint.Id)
- .then(function sucess() {
- status = 1;
- }).catch(function error() {
- status = 2;
- }).finally(function () {
- if (endpoint.Status === status) {
- deferred.resolve(endpoint);
return deferred.promise;
}
- EndpointService.updateEndpoint(endpoint.Id, { Status: status })
- .then(function sucess() {
- deferred.resolve(endpoint);
- }).catch(function error(err) {
- deferred.reject({msg: 'Unable to update endpoint status', err: err});
- });
- });
+ function switchToAzureEndpoint(endpoint) {
+ EndpointProvider.setEndpointID(endpoint.Id);
+ EndpointProvider.setEndpointPublicURL(endpoint.PublicURL);
+ EndpointProvider.setOfflineModeFromStatus(endpoint.Status);
+ StateManager.updateEndpointState(endpoint, [])
+ .then(function success() {
+ $state.go('azure.dashboard');
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to connect to the Azure endpoint');
+ });
+ }
- return deferred.promise;
- }
+ function switchToDockerEndpoint(endpoint) {
+ if (endpoint.Status === 2 && endpoint.Snapshots[0] && endpoint.Snapshots[0].Swarm === true) {
+ Notifications.error('Failure', '', 'Endpoint is unreachable. Connect to another swarm manager.');
+ return;
+ } else if (endpoint.Status === 2 && !endpoint.Snapshots[0]) {
+ Notifications.error('Failure', '', 'Endpoint is unreachable and there is no snapshot available for offline browsing.');
+ return;
+ }
- function switchToAzureEndpoint(endpoint) {
- EndpointProvider.setEndpointID(endpoint.Id);
- EndpointProvider.setEndpointPublicURL(endpoint.PublicURL);
- EndpointProvider.setOfflineModeFromStatus(endpoint.Status);
- StateManager.updateEndpointState(endpoint.Name, endpoint.Type, [])
- .then(function success() {
- $state.go('azure.dashboard');
- })
- .catch(function error(err) {
- Notifications.error('Failure', err, 'Unable to connect to the Azure endpoint');
- });
- }
+ EndpointProvider.setEndpointID(endpoint.Id);
+ EndpointProvider.setEndpointPublicURL(endpoint.PublicURL);
+ EndpointProvider.setOfflineModeFromStatus(endpoint.Status);
+ LegacyExtensionManager.initEndpointExtensions(endpoint)
+ .then(function success(data) {
+ var extensions = data;
+ return StateManager.updateEndpointState(endpoint, extensions);
+ })
+ .then(function success() {
+ $state.go('docker.dashboard');
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to connect to the Docker endpoint');
+ });
+ }
- function switchToDockerEndpoint(endpoint) {
- if (endpoint.Status === 2 && endpoint.Snapshots[0] && endpoint.Snapshots[0].Swarm === true) {
- Notifications.error('Failure', '', 'Endpoint is unreachable. Connect to another swarm manager.');
- return;
- } else if (endpoint.Status === 2 && !endpoint.Snapshots[0]) {
- Notifications.error('Failure', '', 'Endpoint is unreachable and there is no snapshot available for offline browsing.');
- return;
- }
+ function triggerSnapshot() {
+ EndpointService.snapshotEndpoints()
+ .then(function success() {
+ Notifications.success('Success', 'Endpoints updated');
+ $state.reload();
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'An error occured during endpoint snapshot');
+ });
+ }
- EndpointProvider.setEndpointID(endpoint.Id);
- EndpointProvider.setEndpointPublicURL(endpoint.PublicURL);
- EndpointProvider.setOfflineModeFromStatus(endpoint.Status);
- LegacyExtensionManager.initEndpointExtensions(endpoint)
- .then(function success(data) {
- var extensions = data;
- return StateManager.updateEndpointState(endpoint, extensions);
- })
- .then(function success() {
- $state.go('docker.dashboard');
- })
- .catch(function error(err) {
- Notifications.error('Failure', err, 'Unable to connect to the Docker endpoint');
- });
- }
+ function initView() {
+ $scope.isAdmin = Authentication.getUserDetails().role === 1;
- function triggerSnapshot() {
- EndpointService.snapshotEndpoints()
- .then(function success() {
- Notifications.success('Success', 'Endpoints updated');
- $state.reload();
- })
- .catch(function error(err) {
- Notifications.error('Failure', err, 'An error occured during endpoint snapshot');
- });
- }
+ MotdService.motd()
+ .then(function success(data) {
+ $scope.motd = data;
+ });
- function initView() {
- $scope.isAdmin = Authentication.getUserDetails().role === 1;
+ $q.all({
+ endpoints: EndpointService.endpoints(),
+ groups: GroupService.groups()
+ })
+ .then(function success(data) {
+ var endpoints = data.endpoints;
+ var groups = data.groups;
+ EndpointHelper.mapGroupNameToEndpoint(endpoints, groups);
+ $scope.endpoints = endpoints;
+ EndpointProvider.setEndpoints(endpoints);
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to retrieve endpoint information');
+ });
+ }
- MotdService.motd()
- .then(function success(data) {
- $scope.motd = data;
- });
-
- $q.all({
- endpoints: EndpointService.endpoints(),
- groups: GroupService.groups()
- })
- .then(function success(data) {
- var endpoints = data.endpoints;
- var groups = data.groups;
- EndpointHelper.mapGroupNameToEndpoint(endpoints, groups);
- $scope.endpoints = endpoints;
- EndpointProvider.setEndpoints(endpoints);
- })
- .catch(function error(err) {
- Notifications.error('Failure', err, 'Unable to retrieve endpoint information');
- });
- }
-
- initView();
-}]);
+ initView();
+ }]);
diff --git a/app/portainer/views/teams/teamsController.js b/app/portainer/views/teams/teamsController.js
index 6c01427ac..9b63b234e 100644
--- a/app/portainer/views/teams/teamsController.js
+++ b/app/portainer/views/teams/teamsController.js
@@ -1,6 +1,6 @@
angular.module('portainer.app')
-.controller('TeamsController', ['$q', '$scope', '$state', '$sanitize', 'TeamService', 'UserService', 'ModalService', 'Notifications', 'Authentication',
-function ($q, $scope, $state, $sanitize, TeamService, UserService, ModalService, Notifications, Authentication) {
+.controller('TeamsController', ['$q', '$scope', '$state', 'TeamService', 'UserService', 'ModalService', 'Notifications', 'Authentication',
+function ($q, $scope, $state, TeamService, UserService, ModalService, Notifications, Authentication) {
$scope.state = {
actionInProgress: false
};
@@ -22,7 +22,7 @@ function ($q, $scope, $state, $sanitize, TeamService, UserService, ModalService,
};
$scope.addTeam = function() {
- var teamName = $sanitize($scope.formValues.Name);
+ var teamName = $scope.formValues.Name;
var leaderIds = [];
angular.forEach($scope.formValues.Leaders, function(user) {
leaderIds.push(user.Id);
diff --git a/appveyor-ci.yml b/appveyor-ci.yml
deleted file mode 100644
index ab1188611..000000000
--- a/appveyor-ci.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-version: 1.0.{build}
-image:
- - Visual Studio 2017
- - Ubuntu
-environment:
- matrix:
- - ARCH: amd64
- - ARCH: arm
- - ARCH: arm64
- - ARCH: ppc64le
- - ARCH: s390x
- DOCKER_USER:
- secure: JapmC7j5F0mY3j/MVzU+Cw==
- DOCKER_PASS:
- secure: QGlCLNWzPD0HL8ipkohVic45/yU3bVOdjn0IiV6NnSQ=
-matrix:
- exclude:
- - image: Visual Studio 2017
- ARCH: arm
- - image: Visual Studio 2017
- ARCH: arm64
- - image: Visual Studio 2017
- ARCH: ppc64le
- - image: Visual Studio 2017
- ARCH: s390x
-branches:
- except:
- - master
-stack:
- - node 9, go 1.10
-install:
- - yarn install
- - npm install -g rebase-docker-image
-init:
- - sh: export IMAGE=linux
- - cmd: SET IMAGE=windows
- - ps: >-
- if (!(Test-Path ~/.docker)) { mkdir ~/.docker };
- Set-Content -Value '{ "experimental": "enabled" }' -Path ~/.docker/config.json -Encoding Ascii
-build_script:
- - sh: yarn grunt appveyorbuild:$IMAGE:$ARCH
- - cmd: yarn grunt appveyorbuild:%IMAGE%:%ARCH%
- - sh: sudo bash build/ci-linux.sh $IMAGE $ARCH $DOCKER_USER $DOCKER_PASS $APPVEYOR_REPO_BRANCH $APPVEYOR_PULL_REQUEST_NUMBER
- - cmd: powershell -Command "& .\\build\\ci-windows.ps1"
diff --git a/appveyor-release.yml b/appveyor-release.yml
deleted file mode 100644
index 6293e6c90..000000000
--- a/appveyor-release.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-version: 1.0.{build}
-image:
- - Visual Studio 2017
- - Ubuntu
-environment:
- matrix:
- - ARCH: amd64
- - ARCH: arm
- - ARCH: arm64
- - ARCH: ppc64le
- - ARCH: s390x
- DOCKER_USER:
- secure: JapmC7j5F0mY3j/MVzU+Cw==
- DOCKER_PASS:
- secure: QGlCLNWzPD0HL8ipkohVic45/yU3bVOdjn0IiV6NnSQ=
- PORTAINER_VERSION: "1.19.2"
-matrix:
- exclude:
- - image: Visual Studio 2017
- ARCH: arm
- - image: Visual Studio 2017
- ARCH: arm64
- - image: Visual Studio 2017
- ARCH: ppc64le
- - image: Visual Studio 2017
- ARCH: s390x
-branches:
- only:
- - master
-stack: node 9, go 1.10
-artifacts:
- - path: 'portainer-$(PORTAINER_VERSION)-$(IMAGE)-$(ARCH).tar.gz'
- type: file
- - path: 'portainer-$(PORTAINER_VERSION)-$(IMAGE)-$(ARCH)-checksum.txt'
- type: file
-install:
- - yarn install
- - npm install -g rebase-docker-image
-init:
- - sh: export IMAGE=linux
- - cmd: SET IMAGE=windows
- - ps: >-
- if (!(Test-Path ~/.docker)) { mkdir ~/.docker }
- Set-Content -Value '{ "experimental": "enabled" }' -Path ~/.docker/config.json -Encoding Ascii
-build_script:
- - sh: yarn grunt appveyorbuild:$IMAGE:$ARCH
- - cmd: yarn grunt appveyorbuild:%IMAGE%:%ARCH%
- - sh: sudo bash build/release-linux.sh $IMAGE $ARCH $PORTAINER_VERSION $DOCKER_USER $DOCKER_PASS
- - cmd: powershell -Command "& .\\build\\release-windows.ps1"
-test: off
-deploy:
- release: Release $(PORTAINER_VERSION)
- description: ''
- provider: GitHub
- auth_token:
- secure: BRYVGj94QlFBCMoO8yhSu+AGqKNV1+03LJEFrNUTRzo5erXfUHUIi/rgztnxfSGW
- artifact: /portainer-$(PORTAINER_VERSION)-$(IMAGE)-$(ARCH).*/
- draft: true
- prerelease: false
- on:
- branch: master
diff --git a/build/build_binary.ps1 b/build/build_binary.ps1
new file mode 100755
index 000000000..f444f776e
--- /dev/null
+++ b/build/build_binary.ps1
@@ -0,0 +1,17 @@
+param (
+ [string]$platform,
+ [string]$arch
+)
+
+$ErrorActionPreference = "Stop";
+
+$binary = "portainer.exe"
+$project_path = (Get-ITEM -Path env:APPVEYOR_BUILD_FOLDER).Value
+
+New-Item -Name dist -Path "$project_path" -ItemType Directory | Out-Null
+Set-Location -Path "$project_path\api\cmd\portainer"
+
+C:\go\bin\go.exe get -t -d -v ./...
+C:\go\bin\go.exe build -v
+
+Move-Item -Path "$($binary)" -Destination "..\..\..\dist"
diff --git a/build/build_binary.sh b/build/build_binary.sh
new file mode 100755
index 000000000..b9fe6509c
--- /dev/null
+++ b/build/build_binary.sh
@@ -0,0 +1,9 @@
+binary="portainer"
+mkdir -p dist
+
+cd 'api/cmd/portainer'
+
+go get -t -d -v ./...
+GOOS=$1 GOARCH=$2 CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s'
+
+mv "${binary}" "../../../dist/portainer"
\ No newline at end of file
diff --git a/build/build_binary_devops.ps1 b/build/build_binary_devops.ps1
new file mode 100755
index 000000000..6e048b0f3
--- /dev/null
+++ b/build/build_binary_devops.ps1
@@ -0,0 +1,24 @@
+param (
+ [string]$platform,
+ [string]$arch
+)
+
+$ErrorActionPreference = "Stop";
+
+$binary = "portainer.exe"
+$project_path = (Get-ITEM -Path env:BUILD_SOURCESDIRECTORY).Value
+
+Set-Item env:GOPATH "$project_path\api"
+
+New-Item -Name dist -Path "$project_path" -ItemType Directory | Out-Null
+New-Item -Name portainer -Path "$project_path\api\src\github.com\" -ItemType Directory | Out-Null
+
+Copy-Item -Path "$project_path\api" -Destination "$project_path\api\src\github.com\portainer" -Recurse -Force -ErrorAction:SilentlyContinue
+Rename-Item -Path "$project_path\api\src\github.com\portainer\api" -NewName "portainer" -ErrorAction:SilentlyContinue
+
+Set-Location -Path "$project_path\api\cmd\portainer"
+
+go.exe get -t -d -v ./...
+go.exe build -v
+
+Move-Item -Path "$project_path\api\cmd\portainer\$($binary)" -Destination "$project_path\dist"
diff --git a/build/build_binary_devops.sh b/build/build_binary_devops.sh
new file mode 100755
index 000000000..ccabcc6d7
--- /dev/null
+++ b/build/build_binary_devops.sh
@@ -0,0 +1,15 @@
+export GOPATH="$BUILD_SOURCESDIRECTORY/api"
+
+binary="portainer"
+
+mkdir -p dist
+mkdir -p api/src/github.com/portainer/
+
+cp -R api/ api/src/github.com/portainer/portainer/
+
+cd 'api/cmd/portainer'
+
+go get -t -d -v ./...
+GOOS=$1 GOARCH=$2 CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s'
+
+mv "$BUILD_SOURCESDIRECTORY/api/cmd/portainer/$binary" "$BUILD_SOURCESDIRECTORY/dist/portainer"
diff --git a/build/download_docker_binary.ps1 b/build/download_docker_binary.ps1
new file mode 100644
index 000000000..b5d6b6c13
--- /dev/null
+++ b/build/download_docker_binary.ps1
@@ -0,0 +1,13 @@
+param (
+ [string]$docker_version
+)
+
+$ErrorActionPreference = "Stop";
+
+New-Item -Path "docker-binary" -ItemType Directory | Out-Null
+
+$download_folder = "docker-binary"
+
+Invoke-WebRequest -O "$($download_folder)/docker-binaries.zip" "https://download.docker.com/win/static/stable/x86_64/docker-$($docker_version).zip"
+Expand-Archive -Path "$($download_folder)/docker-binaries.zip" -DestinationPath "$($download_folder)"
+Move-Item -Path "$($download_folder)/docker/docker.exe" -Destination "dist"
diff --git a/distribution/portainer.spec b/distribution/portainer.spec
index b974ae153..b4800443e 100644
--- a/distribution/portainer.spec
+++ b/distribution/portainer.spec
@@ -1,5 +1,5 @@
Name: portainer
-Version: 1.20.0
+Version: 1.20.1
Release: 0
License: Zlib
Summary: A lightweight docker management UI
diff --git a/gruntfile.js b/gruntfile.js
index 8379d98f3..defcd07bf 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -51,6 +51,10 @@ module.exports = function(grunt) {
grunt.task.run(['config:prod', 'clean:all', 'shell:buildBinary:' + p + ':' + a, 'shell:downloadDockerBinary:' + p + ':' + a, 'before-copy', 'copy:assets', 'after-copy']);
});
+ grunt.task.registerTask('devopsbuild', 'devopsbuild:
:', function(p, a) {
+ grunt.task.run(['config:prod', 'clean:all', 'shell:buildBinaryOnDevOps:' + p + ':' + a, 'shell:downloadDockerBinary:' + p + ':' + a, 'before-copy', 'copy:assets', 'after-copy']);
+ });
+
grunt.registerTask('lint', ['eslint']);
grunt.registerTask('run-dev', ['build', 'shell:run:' + arch, 'watch:build']);
grunt.registerTask('clear', ['clean:app']);
@@ -261,13 +265,31 @@ gruntfile_cfg.replace = {
function shell_buildBinary(p, a) {
var binfile = 'dist/portainer-' + p + '-' + a;
- return [
- 'if [ -f ' + ((p === 'windows') ? binfile + '.exe' : binfile) + ' ]; then',
- 'echo "Portainer binary exists";',
- 'else',
- 'build/build_in_container.sh ' + p + ' ' + a + ';',
- 'fi'
- ].join(' ');
+ if (p === 'linux') {
+ return [
+ 'if [ -f ' + (binfile) + ' ]; then',
+ 'echo "Portainer binary exists";',
+ 'else',
+ 'build/build_binary.sh ' + p + ' ' + a + ';',
+ 'fi'
+ ].join(' ');
+ } else {
+ return [
+ 'powershell -Command "& {if (Get-Item -Path ' + binfile + '.exe -ErrorAction:SilentlyContinue) {',
+ 'Write-Host "Portainer binary exists"',
+ '} else {',
+ '& ".\\build\\build_binary.ps1" -platform ' + p + ' -arch ' + a + '',
+ '}}"'
+ ].join(' ');
+ }
+}
+
+function shell_buildBinaryOnDevOps(p, a) {
+ if (p === 'linux') {
+ return 'build/build_binary_devops.sh ' + p + ' ' + a + ';';
+ } else {
+ return 'powershell -Command ".\\build\\build_binary_devops.ps1 -platform ' + p + ' -arch ' + a + '"';
+ }
}
function shell_run(arch) {
@@ -283,17 +305,28 @@ function shell_downloadDockerBinary(p, a) {
var ip = ((ps[p] === undefined) ? p : ps[p]);
var ia = ((as[a] === undefined) ? a : as[a]);
var binaryVersion = ((p === 'windows' ? '<%= shippedDockerVersionWindows %>' : '<%= shippedDockerVersion %>'));
- return [
- 'if [ -f ' + ((p === 'windows') ? 'dist/docker.exe' : 'dist/docker') + ' ]; then',
- 'echo "Docker binary exists";',
- 'else',
- 'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';',
- 'fi'
- ].join(' ');
+ if (p === 'linux') {
+ return [
+ 'if [ -f dist/docker ]; then',
+ 'echo "Docker binary exists";',
+ 'else',
+ 'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';',
+ 'fi'
+ ].join(' ');
+ } else {
+ return [
+ 'powershell -Command "& {if (Get-Item -Path dist/docker.exe -ErrorAction:SilentlyContinue) {',
+ 'Write-Host "Docker binary exists"',
+ '} else {',
+ '& ".\\build\\download_docker_binary.ps1" -docker_version ' + binaryVersion + '',
+ '}}"'
+ ].join(' ');
+ }
}
gruntfile_cfg.shell = {
buildBinary: { command: shell_buildBinary },
+ buildBinaryOnDevOps: { command: shell_buildBinaryOnDevOps },
run: { command: shell_run },
downloadDockerBinary: { command: shell_downloadDockerBinary }
};
diff --git a/package.json b/package.json
index 2fc6e9772..d6277314c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"author": "Portainer.io",
"name": "portainer",
"homepage": "http://portainer.io",
- "version": "1.20.0",
+ "version": "1.20.1",
"repository": {
"type": "git",
"url": "git@github.com:portainer/portainer.git"
@@ -52,7 +52,7 @@
"angularjs-scroll-glue": "^2.2.0",
"angularjs-slider": "^6.4.0",
"bootbox": "^4.4.0",
- "bootstrap": "~3.3.6",
+ "bootstrap": "^3.4.0",
"chart.js": "~2.6.0",
"codemirror": "~5.30.0",
"filesize": "~3.3.0",
diff --git a/templates.json b/templates.json
index f99369d9f..c2dfe94a3 100644
--- a/templates.json
+++ b/templates.json
@@ -874,5 +874,18 @@
"label": "Datadog API key"
}
]
+ },
+ {
+ "type": 1,
+ "title": "Sonatype Nexus3",
+ "description": "Sonatype Nexus3 registry manager",
+ "categories": ["docker"],
+ "platform": "linux",
+ "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/sonatype.png",
+ "image": "sonatype/nexus3:latest",
+ "ports": [
+ "8081/tcp"
+ ],
+ "volumes": [{ "container": "/nexus-data"}]
}
]
diff --git a/yarn.lock b/yarn.lock
index 5e094094b..4877533d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -139,7 +139,6 @@ angular-mocks@~1.5.0:
angular-moment-picker@^0.10.2:
version "0.10.2"
resolved "https://registry.yarnpkg.com/angular-moment-picker/-/angular-moment-picker-0.10.2.tgz#54c8b3c228b33dffa3b7b3d0773a585323815c33"
- integrity sha512-WvmrQM0zEcFqi50yDELaF34Ilrx4PtL7mWLcpTZCJGQDvMlIsxJrB30LxOkoJv8yrrLxD2s6nnR3t1/SqioWWw==
dependencies:
angular "^1.3"
moment "^2.16.0"
@@ -167,7 +166,6 @@ angular@1.x, angular@~1.5.0:
angular@^1.3:
version "1.7.5"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.5.tgz#d1c1c01c6f5dc835638f3f9aa51012857bdac49e"
- integrity sha512-760183yxtGzni740IBTieNuWLtPNAoMqvmC0Z62UoU0I3nqk+VJuO3JbQAXOyvo3Oy/ZsdNQwrSTh/B0OQZjNw==
angularjs-scroll-glue@^2.2.0:
version "2.2.0"
@@ -407,9 +405,9 @@ bootbox@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/bootbox/-/bootbox-4.4.0.tgz#ff7f898fb87d4527e547feb64158f88450d1a0c9"
-bootstrap@~3.3.6:
- version "3.3.7"
- resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71"
+bootstrap@^3.4.0:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.0.tgz#f8d77540dd3062283d2ae7687e21c1e691961640"
brace-expansion@^1.0.0, brace-expansion@^1.1.7:
version "1.1.8"
@@ -2921,7 +2919,6 @@ moment@^2.10.6:
moment@^2.16.0:
version "2.22.2"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
- integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
moment@^2.21.0:
version "2.21.0"
@@ -4527,7 +4524,6 @@ xtend@~3.0.0:
xterm@^3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.8.0.tgz#55d1de518bdc9c9793823f5e4e97d6898972938d"
- integrity sha512-rS3HLryuMWbLsv98+jVVSUXCxmoyXPwqwJNC0ad0VSMdXgl65LefPztQVwfurkaF7kM7ZSgM8eJjnJ9kkdoR1w==
yargs@~3.10.0:
version "3.10.0"