Просмотр исходного кода

adjust version, fix repoTag removal in docker driver

tags/v1.5.4
Jonathan Cobb 4 лет назад
Родитель
Сommit
124546f0e7
5 измененных файлов: 9 добавлений и 8 удалений
  1. +2
    -2
      bubble-server/pom.xml
  2. +4
    -3
      bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java
  3. +1
    -1
      bubble-server/src/main/resources/META-INF/bubble/bubble.properties
  4. +1
    -1
      pom.xml
  5. +1
    -1
      utils/pom.xml

+ 2
- 2
bubble-server/pom.xml Просмотреть файл

@@ -11,12 +11,12 @@
<groupId>bubble</groupId> <groupId>bubble</groupId>
<artifactId>bubble</artifactId> <artifactId>bubble</artifactId>
<!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it --> <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
<version>1.5.2</version>
<version>1.4.51</version>
</parent> </parent>


<artifactId>bubble-server</artifactId> <artifactId>bubble-server</artifactId>
<!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it --> <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
<version>1.5.2</version>
<version>1.4.51</version>


<repositories> <repositories>
<repository> <repository>


+ 4
- 3
bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java Просмотреть файл

@@ -201,10 +201,11 @@ public class DockerComputeDriver extends ComputeServiceDriverBase {
if (empty(i.getRepoTags())) { if (empty(i.getRepoTags())) {
name = i.getId(); name = i.getId();
} else if (i.getRepoTags().length == 1) { } else if (i.getRepoTags().length == 1) {
if (i.getRepoTags()[0].contains(":")) {
name = i.getRepoTags()[0].substring(repository.indexOf(":")+1);
final String repoTag = i.getRepoTags()[0];
if (repoTag.contains(":")) {
name = repoTag.substring(repoTag.indexOf(":") + 1);
} else { } else {
name = i.getRepoTags()[0];
name = repoTag;
} }
} else { } else {
name = json(i.getRepoTags()); name = json(i.getRepoTags());


+ 1
- 1
bubble-server/src/main/resources/META-INF/bubble/bubble.properties Просмотреть файл

@@ -1,3 +1,3 @@
# Do not edit this file directly # Do not edit this file directly
# Use _set_version to update the Bubble version in all files # Use _set_version to update the Bubble version in all files
bubble.version=Adventure 1.5.2
bubble.version=Adventure 1.4.51

+ 1
- 1
pom.xml Просмотреть файл

@@ -14,7 +14,7 @@
<groupId>bubble</groupId> <groupId>bubble</groupId>
<artifactId>bubble</artifactId> <artifactId>bubble</artifactId>
<!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it --> <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
<version>1.5.2</version>
<version>1.4.51</version>
<packaging>pom</packaging> <packaging>pom</packaging>


<licenses> <licenses>


+ 1
- 1
utils/pom.xml Просмотреть файл

@@ -10,7 +10,7 @@ This code is available under the GNU Affero General Public License, version 3: h
<groupId>bubble</groupId> <groupId>bubble</groupId>
<artifactId>utils</artifactId> <artifactId>utils</artifactId>
<!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it --> <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
<version>1.5.2</version>
<version>1.4.51</version>
<packaging>pom</packaging> <packaging>pom</packaging>


<licenses> <licenses>


Загрузка…
Отмена
Сохранить