diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-02-18 18:23:18 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-02-18 18:23:47 +0000 |
| commit | 10544f9cc3a7bbef787003c7e89735d11d38aeaf (patch) | |
| tree | cd9752554fb2f55e18d45570f89205cdaf456082 | |
| parent | f80e6a127d51d68ff6c77196767ea8ea10e73243 (diff) | |
Changes for docker push in LF
Change-Id: I2e4a2e0ae5afcc1665580b90072114f5598becde
Signed-off-by: Carsten Lund <lund@research.att.com>
| -rw-r--r-- | dcae-demo-controller/.project | 2 | ||||
| -rw-r--r-- | dcae-demo-controller/src/main/docker-build/push.sh | 5 | ||||
| -rw-r--r-- | dcae-demo-controller/src/main/resources/settings.xml | 66 |
3 files changed, 2 insertions, 71 deletions
diff --git a/dcae-demo-controller/.project b/dcae-demo-controller/.project index 2000556..8a683b5 100644 --- a/dcae-demo-controller/.project +++ b/dcae-demo-controller/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>dcae-controller-opensource</name> + <name>dcae-demo-controller</name> <comment></comment> <projects> </projects> diff --git a/dcae-demo-controller/src/main/docker-build/push.sh b/dcae-demo-controller/src/main/docker-build/push.sh index dd43aa9..379cfd5 100644 --- a/dcae-demo-controller/src/main/docker-build/push.sh +++ b/dcae-demo-controller/src/main/docker-build/push.sh @@ -8,12 +8,9 @@ cd $(dirname $(readlink -e $0)) GITROOT=../../../../.. VERSION=$(grep version $GITROOT/pom.xml | head -1 | sed 'sX</.*XX' | sed 's/.*>//') -USER=$1 -PASSWORD=$2 -DOCKER_REG=$3 +DOCKER_REG=$1 TAG=$DOCKER_REG/dcae-controller:$VERSION docker tag dcae-controller:$VERSION $TAG -docker login -u $USER -p $PASSWORD $DOCKER_REG docker push $TAG diff --git a/dcae-demo-controller/src/main/resources/settings.xml b/dcae-demo-controller/src/main/resources/settings.xml deleted file mode 100644 index 6432c83..0000000 --- a/dcae-demo-controller/src/main/resources/settings.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - - <profiles> - <profile> - <id>open-ecomp</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>osecomp-nexus-releases</id> - <name>OSECOMP Release Repository</name> - <url>https://ecomp-nexus:8443/repository/maven-releases</url> - </repository> - <repository> - <id>osecomp-nexus-snapshots</id> - <name>OSECOMP Snapshot Repository</name> - <url>https://ecomp-nexus:8443/repository/maven-snapshots</url> - </repository> - <repository> - <id>eclipse</id> - <url>https://repo.eclipse.org/content/repositories/releases</url> - <releases> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - </profile> - - </profiles> - - <activeProfiles> - <activeProfile>open-ecomp</activeProfile> - </activeProfiles> - - <servers> - <server> - <id>osecomp-nexus</id> - <username>USER</username> - <password>PASSWORD</password> - </server> - <server> - <username>USER</username> - <password>PASSWORD</password> - <id>osecomp-nexus-releases</id> - </server> - <server> - <username>USER</username> - <password>PASSWORD</password> - <id>osecomp-nexus-snapshots</id> - </server> - <server> - <username>USER</username> - <password>PASSWORD</password> - <id>dcae-javadoc</id> - </server> - </servers> -</settings> |