summaryrefslogtreecommitdiffstats
path: root/packages/docker
AgeCommit message (Collapse)AuthorFilesLines
2017-03-08Do not start chef-solo if mso-docker.json is emptyAlexis de Talhouët1-3/+8
Chef-solo is started both from the docker container [1] and from the start-jboss-server.sh script [2]. The Dockerfile is configured to erase the mso-docker.json configuration once applied, so when the container is started, and the strat-jboss-server.sh tries to play the recipes again, it fails as the environment file is empty. This patch adds a check to see if the file is empty, if not, we play the chef-solo recipes again, to overwrite the config. [1]: https://gerrit.openecomp.org/r/gitweb?p=mso.git;a=blob;f=packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final;h=ff7f44bcfdba6fa0328cbd50803d3dc80a2a1def;hb=refs/heads/master#l57 [2]: https://gerrit.openecomp.org/r/gitweb?p=mso.git;a=blob;f=packages/docker/src/main/docker/docker-files/scripts/start-jboss-server.sh;h=2e9b9da27dd3d01fcf5ebc304ac03b15142fde53;hb=refs/heads/master#l16 Change-Id: I34573dedaaafbeb6b511f47b72e6e0cefea4e1d5 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2017-03-07Merge "Hard-code MSO gerrit url"Christophe Closset1-2/+5
2017-03-07Hard-code MSO gerrit urlAlexis de Talhouët1-2/+5
env.GIT_NO_PROJECT is only used in Jenkins. Downstream user don't have knowledge of this variable, but are failing to build because of it. The gerrit url shouldn't be subject to change, hence hard-coding its value in a maven property. Change-Id: Ieed47a282636eafd0556242f56dc0b4d3596ea29 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2017-03-07Remove AT&T HTTP proxy URL from Dockerfile(s)Alexis de Talhouët1-3/+3
As this is now open-source code, they shouldn't be any reference to AT&T proxy settings. One can still configure the HTTP proxy by providing its proxy address, and by enabling it in docker-files/settings.xml. Change-Id: I190dc9e01349a9948b2103fb1791191e89b7399d Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2017-02-16Use LF env variables for git+sshAnaël Closson1-2/+2
Change-Id: I89a253d84141aafe5ff75b7306514c3f5c897302 Signed-off-by: Anaël Closson <ac2550@intl.att.com>
2017-02-16Docker should clone config firstAnaël Closson2-1/+37
Mso-config and chef-config repos should be clone for docker image builds. Those repositories are taken from official openecomp.org repositories. Change-Id: I754472cc2e28c2ec2021b2c853566e12f8c9fe6b Signed-off-by: Anaël Closson <ac2550@intl.att.com>
2017-02-09Remove repositories as Docker files dependencyAnaël Closson6-368/+29
Docker files used to clone git repositories for internal configuration managements. The git repositories should now be clone outside of the image building process and put in a specific directory. See src/main/docker/docker-files/chef-configs/readme.md. Change-Id: I4f8700b5f6e89821d223b7bacae51effb95daf9f Signed-off-by: Anaël Closson <ac2550@intl.att.com>
2017-02-08Update naming to match openecompAnaël Closson6-15/+14
Change-Id: I972f55fa679958e5d76076d991a0a1de3a7d1de1 Signed-off-by: Anaël Closson <ac2550@intl.att.com>
2017-02-08Using openecomp instead of ecompAnaël Closson1-8/+8
Change-Id: I61683cefa4b297cd961c621701eca3dd2eb00186 Signed-off-by: Anaël Closson <ac2550@intl.att.com>
2017-02-08Invalid group id for opensource releaseAnaël Closson1-1/+1
Change-Id: Ic6e50a51634c8900a1055427226e2d509cb4e394 Signed-off-by: Anaël Closson <ac2550@intl.att.com>
2017-02-08Indentation cleanupAnaël Closson1-11/+9
Change-Id: Ic0f8ad4b033a6efc6b20ec347eb14b397794b66e Signed-off-by: Anaël Closson <ac2550@intl.att.com>
2017-01-31Initial OpenECOMP MSO commitChrisC18-0/+1606
Change-Id: Ia6a7574859480717402cc2f22534d9973a78fa6d Signed-off-by: ChrisC <cc697w@intl.att.com>