diff options
| -rwxr-xr-x | conductor/docker/api/Dockerfile | 26 | ||||
| -rwxr-xr-x | conductor/docker/controller/Dockerfile | 26 | ||||
| -rwxr-xr-x | conductor/docker/data/Dockerfile | 24 | ||||
| -rwxr-xr-x | conductor/docker/reservation/Dockerfile | 26 | ||||
| -rwxr-xr-x | conductor/docker/solver/Dockerfile | 32 | ||||
| -rw-r--r-- | conductor/version.properties | 28 |
6 files changed, 132 insertions, 30 deletions
diff --git a/conductor/docker/api/Dockerfile b/conductor/docker/api/Dockerfile index 0471897..bc0b07d 100755 --- a/conductor/docker/api/Dockerfile +++ b/conductor/docker/api/Dockerfile @@ -1,10 +1,26 @@ -FROM python:2.7 +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 AT&T Intellectual Property +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------- + +FROM python:2.7 RUN apt-get update -RUN apt-get --assume-yes install python-setuptools -RUN git clone https://fi241c@codecloud.web.att.com/scm/st_cloudqos/conductor.git +RUN apt-get --assume-yes install python-setuptools +RUN git clone https://gerrit.onap.org/r/optf/has WORKDIR ./conductor -RUN pip install . +RUN pip install . COPY ./conductor.conf conductor.conf -COPY ./api_paste.ini api_paste.ini RUN ls -ltr /usr/local/bin/conductor-api CMD ["sh","-c", "python /usr/local/bin/conductor-api --port=8091 -- --config-file=conductor.conf"] diff --git a/conductor/docker/controller/Dockerfile b/conductor/docker/controller/Dockerfile index dc2efee..427cc9b 100755 --- a/conductor/docker/controller/Dockerfile +++ b/conductor/docker/controller/Dockerfile @@ -1,11 +1,27 @@ -FROM python:2.7 +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 AT&T Intellectual Property +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------- + +FROM python:2.7 RUN apt-get update -RUN apt-get --assume-yes install python-setuptools +RUN apt-get --assume-yes install python-setuptools RUN virtualenv ../venv -RUN git clone https://fi241c@codecloud.web.att.com/scm/st_cloudqos/conductor.git +RUN git clone https://gerrit.onap.org/r/optf/has WORKDIR ./conductor -RUN pip install . +RUN pip install . RUN pwd - RUN echo "Starting conductor-controller" CMD ["python","/usr/local/bin/conductor-controller", "--config-file=/usr/local/bin/conductor.conf"] diff --git a/conductor/docker/data/Dockerfile b/conductor/docker/data/Dockerfile index 7cc988d..207929c 100755 --- a/conductor/docker/data/Dockerfile +++ b/conductor/docker/data/Dockerfile @@ -1,11 +1,27 @@ -FROM python:2.7 +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 AT&T Intellectual Property +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------- + +FROM python:2.7 RUN apt-get update -RUN apt-get --assume-yes install python-setuptools +RUN apt-get --assume-yes install python-setuptools RUN virtualenv ../venv RUN git clone https://fi241c@codecloud.web.att.com/scm/st_cloudqos/conductor.git WORKDIR ./conductor -RUN pip install . +RUN pip install . RUN pwd - RUN echo "Starting conductor-data" CMD ["python","/usr/local/bin/conductor-data", "--config-file=/usr/local/bin/conductor.conf"] diff --git a/conductor/docker/reservation/Dockerfile b/conductor/docker/reservation/Dockerfile index cc738f3..2402f1d 100755 --- a/conductor/docker/reservation/Dockerfile +++ b/conductor/docker/reservation/Dockerfile @@ -1,11 +1,27 @@ -FROM python:2.7 +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 AT&T Intellectual Property +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------- + +FROM python:2.7 RUN apt-get update -RUN apt-get --assume-yes install python-setuptools +RUN apt-get --assume-yes install python-setuptools RUN virtualenv ../venv -RUN git clone https://fi241c@codecloud.web.att.com/scm/st_cloudqos/conductor.git +RUN git clone https://gerrit.onap.org/r/optf/has WORKDIR ./conductor -RUN pip install . +RUN pip install . RUN pwd - RUN echo "Starting conductor-reservation" CMD ["python","/usr/local/bin/conductor-reservation", "--config-file=/usr/local/bin/conductor.conf"] diff --git a/conductor/docker/solver/Dockerfile b/conductor/docker/solver/Dockerfile index c482a7d..3aad3a9 100755 --- a/conductor/docker/solver/Dockerfile +++ b/conductor/docker/solver/Dockerfile @@ -1,17 +1,27 @@ -FROM python:2.7 +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 AT&T Intellectual Property +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------- + +FROM python:2.7 RUN apt-get update -RUN apt-get --assume-yes install python-setuptools +RUN apt-get --assume-yes install python-setuptools RUN virtualenv ../venv -RUN git clone https://fi241c@codecloud.web.att.com/scm/st_cloudqos/conductor.git +RUN git clone https://gerrit.onap.org/r/optf/has WORKDIR ./conductor -RUN pip install . +RUN pip install . RUN pwd - - RUN echo "Starting conductor-solver" CMD ["python","/usr/local/bin/conductor-solver", "--config-file=/usr/local/bin/conductor.conf"] - - - - - diff --git a/conductor/version.properties b/conductor/version.properties new file mode 100644 index 0000000..56533db --- /dev/null +++ b/conductor/version.properties @@ -0,0 +1,28 @@ +# +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 AT&T Intellectual Property +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------- +# + +major=1 +minor=1 +patch=0 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT |