Skip to content

Commit 3b4d0ac

Browse files
pierotofypierotofy
committed
Add support for docker login
1 parent 4e0ed32 commit 3b4d0ac

File tree

9 files changed

+144
-65
lines changed

9 files changed

+144
-65
lines changed

‎docs/aws.md‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,18 @@ the on-demand instance cost - you'll always pay the current market price, not yo
6363

6464
"addSwap": 1,
6565
"dockerImage": "opendronemap/nodeodm",
66-
"dockerDataDirMountPath": ""
66+
"dockerDataDirMountPath": "",
67+
68+
"dockerRegistry":{
69+
"username": "",
70+
"password": "",
71+
"url": ""
72+
}
6773
}
6874
```
6975

7076
| Field | Description |
71-
|--------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|
77+
| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- |
7278
| accessKey | AWS Access Key |
7379
| secretKey | AWS Secret Key |
7480
| s3 | S3 bucket configuration. |
@@ -82,7 +88,7 @@ the on-demand instance cost - you'll always pay the current market price, not yo
8288
| maxUploadTime | Maximum number of seconds an instance is allowed to receive file uploads. Set to -1 for no limit. |
8389
| monitoring | Set to true to enable detailed Cloudwatch monitoring for the instance. |
8490
| region | Region identifier where the instances should be created. |
85-
| zone | Zone identifier where the instances should be created. |
91+
| zone | Zone identifier where the instances should be created. |
8692
| ami | The AMI (machine image) to launch this instance from. Note that AMIs are region-specific. |
8793
| engineInstallUrl | Specify installer for Docker engine. This can be cleared if AMI already has Docker engine installed. |
8894
| tags | Comma-separated list of key,value tags to associate to the instance. |
@@ -91,8 +97,9 @@ the on-demand instance cost - you'll always pay the current market price, not yo
9197
| addSwap | Optionally add this much swap space to the instance as a factor of total RAM (`RAM * addSwap`). A value of `1` sets a swapfile equal to the available RAM. |
9298
| dockerImage | Docker image to launch |
9399
| dockerDataDirMountPath | Path on node host to map to NodeODM data directory (/var/www/data). Use local instance storage for much faster I/O. |
94-
| dockerGpu | Enables GPU acceleration by passing `--gpu all` to docker |
100+
| dockerGpu | Enables GPU acceleration by passing `--gpu all` to docker |
95101
| nodeSetupCmd | Can be optionally used to run a setup command on auto-scaled nodes right before we run ODM. |
102+
| dockerRegistry | If pulling images from a private registry or repository, issue a docker login with these information |
96103

97104
## Image Size Mapping
98105

‎docs/digitalocean.md‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,34 @@ Example configuration file:
3838
"minImages": -1,
3939

4040
"addSwap": 1,
41-
"dockerImage": "opendronemap/nodeodm"
41+
"dockerImage": "opendronemap/nodeodm",
42+
43+
"dockerRegistry":{
44+
"username": "",
45+
"password": "",
46+
"url": ""
47+
}
4248
}
4349
```
4450

45-
| Field | Description |
46-
|--------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
47-
| accessToken | DigitalOcean API Access Token |
48-
| s3 | S3 keys and bucket configuration |
49-
| dropletsLimit | Maximum number of droplets that are allowed to run at the same time. Set to -1 for no limit. |
50-
| createRetries | Number of attempts to create a droplet before giving up. Defaults to 1.
51-
| maxRuntime | Maximum number of seconds a droplet is allowed to run ever. Set to -1 for no limit. |
52-
| maxUploadTime | Maximum number of seconds a droplet is allowed to receive file uploads. Set to -1 for no limit. |
53-
| region | Region identifier where the droplets should be created. |
54-
| monitoring | Set to true to enable monitoring on the droplet. |
55-
| tags | List of tags to associate to the droplet. |
56-
| image | Image identifier (from public images) or snapshot identifier (private) if snapshot is set to `true` (see below). |
57-
| snapshot | When set to `true`, `image` refers to a snapshot in the user account instead of an image name. Useful to speed up boot time if you already have a droplet with the docker image preloaded. |
58-
| sshKey | Optionally specify an existing DigitalOcean SSH `fingerprint` and private key `path` instead of generating new keys.
59-
| imageSizeMapping | Max images count to droplet size mapping. The autoscaler will pick a droplet size based on the number of images of the incoming task. Use this to control what size of droplet should correspond to which image count. The least powerful droplet able to process a certain number of images is always selected. Valid slug identifiers are available from [Digital Ocean's API list all sizes](https://developers.digitalocean.com/documentation/v2/#list-all-sizes) |
60-
| minImages | Minimum number of images that a dataset needs to have for the autoscaler to be used (-1 = no minimum). |
61-
| addSwap | Optionally add this much swap space to the droplet as a factor of total RAM (`RAM * addSwap`). A value of `1` sets a swapfile equal to the available RAM. |
62-
| dockerImage | Docker image to launch
63-
| dockerGpu | Enables GPU acceleration by passing `--gpu all` to docker |
64-
|
51+
| Field | Description |
52+
| ---------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
53+
| accessToken | DigitalOcean API Access Token |
54+
| s3 | S3 keys and bucket configuration |
55+
| dropletsLimit | Maximum number of droplets that are allowed to run at the same time. Set to -1 for no limit. |
56+
| createRetries | Number of attempts to create a droplet before giving up. Defaults to 1. |
57+
| maxRuntime | Maximum number of seconds a droplet is allowed to run ever. Set to -1 for no limit. |
58+
| maxUploadTime | Maximum number of seconds a droplet is allowed to receive file uploads. Set to -1 for no limit. |
59+
| region | Region identifier where the droplets should be created. |
60+
| monitoring | Set to true to enable monitoring on the droplet. |
61+
| tags | List of tags to associate to the droplet. |
62+
| image | Image identifier (from public images) or snapshot identifier (private) if snapshot is set to `true` (see below). |
63+
| snapshot | When set to `true`, `image` refers to a snapshot in the user account instead of an image name. Useful to speed up boot time if you already have a droplet with the docker image preloaded. |
64+
| sshKey | Optionally specify an existing DigitalOcean SSH `fingerprint` and private key `path` instead of generating new keys. |
65+
| imageSizeMapping | Max images count to droplet size mapping. The autoscaler will pick a droplet size based on the number of images of the incoming task. Use this to control what size of droplet should correspond to which image count. The least powerful droplet able to process a certain number of images is always selected. Valid slug identifiers are available from [Digital Ocean's API list all sizes](https://developers.digitalocean.com/documentation/v2/#list-all-sizes) |
66+
| minImages | Minimum number of images that a dataset needs to have for the autoscaler to be used (-1 = no minimum). |
67+
| addSwap | Optionally add this much swap space to the droplet as a factor of total RAM (`RAM * addSwap`). A value of `1` sets a swapfile equal to the available RAM. |
68+
| dockerImage | Docker image to launch |
69+
| dockerGpu | Enables GPU acceleration by passing `--gpu all` to docker |
70+
| dockerRegistry | If pulling images from a private registry or repository, issue a docker login with these information |
71+

0 commit comments

Comments
 (0)