From: Lott, Christopher (cl778h) Date: Mon, 1 Jul 2019 20:37:29 +0000 (-0400) Subject: Shorten directory names with docker image defs X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=66a126044c9b105e41d8cf359823e66e5c9a43e3;p=ci-management.git Shorten directory names with docker image defs Drop the -nng suffix. Signed-off-by: Lott, Christopher (cl778h) Change-Id: I75dbbbc5f5cc851552517c0071679f52ca4b887e --- diff --git a/docker/bldr-alpine-python-nng/container-tag.yaml b/docker/bldr-alpine-python-nng/container-tag.yaml deleted file mode 100644 index 935ef69e..00000000 --- a/docker/bldr-alpine-python-nng/container-tag.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -tag: 1-py3.7.3-nng1.1.1 diff --git a/docker/bldr-alpine-python-nng/Dockerfile b/docker/bldr-alpine-python/Dockerfile similarity index 93% rename from docker/bldr-alpine-python-nng/Dockerfile rename to docker/bldr-alpine-python/Dockerfile index b805a46d..88e63999 100644 --- a/docker/bldr-alpine-python-nng/Dockerfile +++ b/docker/bldr-alpine-python/Dockerfile @@ -12,7 +12,7 @@ # 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:3-alpine +FROM python:3.7-alpine RUN apk update && \ apk add \ @@ -33,9 +33,8 @@ RUN git clone --branch v2015.09.25 git://git.sv.gnu.org/autoconf-archive.git RUN cp /tmp/autoconf-archive/m4/* /usr/share/aclocal RUN rm -rf /tmp/autoconf-archive -RUN git clone https://github.com/nanomsg/nng +RUN git clone --branch v1.1.1 https://github.com/nanomsg/nng WORKDIR /tmp/nng -RUN git checkout v1.1.1 RUN mkdir /tmp/nng/build WORKDIR /tmp/nng/build RUN cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. diff --git a/docker/bldr-alpine-python/container-tag.yaml b/docker/bldr-alpine-python/container-tag.yaml new file mode 100644 index 00000000..39f7be75 --- /dev/null +++ b/docker/bldr-alpine-python/container-tag.yaml @@ -0,0 +1,2 @@ +--- +tag: 1-py3.7-nng1.1.1 diff --git a/docker/bldr-debian-python-nng/Dockerfile b/docker/bldr-debian-python/Dockerfile similarity index 94% rename from docker/bldr-debian-python-nng/Dockerfile rename to docker/bldr-debian-python/Dockerfile index f2ae43ee..c7c58118 100644 --- a/docker/bldr-debian-python-nng/Dockerfile +++ b/docker/bldr-debian-python/Dockerfile @@ -35,9 +35,8 @@ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja && chmod +x ninja \ && mv ninja /usr/local/bin -RUN git clone https://github.com/nanomsg/nng.git \ +RUN git clone --branch v1.1.1 https://github.com/nanomsg/nng.git \ && cd nng \ - && git checkout v1.1.1 \ && mkdir build \ && cd build \ && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \ diff --git a/docker/bldr-debian-python-nng/container-tag.yaml b/docker/bldr-debian-python/container-tag.yaml similarity index 82% rename from docker/bldr-debian-python-nng/container-tag.yaml rename to docker/bldr-debian-python/container-tag.yaml index b575d2e0..91a8467c 100755 --- a/docker/bldr-debian-python-nng/container-tag.yaml +++ b/docker/bldr-debian-python/container-tag.yaml @@ -1,4 +1,4 @@ # Not feasible to show all the software versions # here so just use a counter plus the base image --- -tag: 2-py3.7-nng1.1.1 +tag: 3-py3.7-nng1.1.1 diff --git a/docker/bldr-ubuntu16-c-go-nng/Dockerfile b/docker/bldr-ubuntu16-c-go/Dockerfile similarity index 96% rename from docker/bldr-ubuntu16-c-go-nng/Dockerfile rename to docker/bldr-ubuntu16-c-go/Dockerfile index 6bee3407..0212d7da 100644 --- a/docker/bldr-ubuntu16-c-go-nng/Dockerfile +++ b/docker/bldr-ubuntu16-c-go/Dockerfile @@ -64,9 +64,8 @@ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja && chmod +x ninja \ && mv ninja /usr/local/bin -RUN git clone https://github.com/nanomsg/nng.git \ +RUN git clone --branch v1.1.1 https://github.com/nanomsg/nng.git \ && cd nng \ - && git checkout v1.1.1 \ && mkdir build \ && cd build \ && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \ diff --git a/docker/bldr-ubuntu16-c-go-nng/container-tag.yaml b/docker/bldr-ubuntu16-c-go/container-tag.yaml similarity index 100% rename from docker/bldr-ubuntu16-c-go-nng/container-tag.yaml rename to docker/bldr-ubuntu16-c-go/container-tag.yaml diff --git a/docker/bldr-ubuntu18-c-go-nng/Dockerfile b/docker/bldr-ubuntu18-c-go/Dockerfile similarity index 96% rename from docker/bldr-ubuntu18-c-go-nng/Dockerfile rename to docker/bldr-ubuntu18-c-go/Dockerfile index e9e0937d..c8421c95 100644 --- a/docker/bldr-ubuntu18-c-go-nng/Dockerfile +++ b/docker/bldr-ubuntu18-c-go/Dockerfile @@ -64,9 +64,8 @@ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja && chmod +x ninja \ && mv ninja /usr/local/bin -RUN git clone https://github.com/nanomsg/nng.git \ +RUN git clone --branch v1.1.1 https://github.com/nanomsg/nng.git \ && cd nng \ - && git checkout v1.1.1 \ && mkdir build \ && cd build \ && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \ diff --git a/docker/bldr-ubuntu18-c-go-nng/container-tag.yaml b/docker/bldr-ubuntu18-c-go/container-tag.yaml similarity index 100% rename from docker/bldr-ubuntu18-c-go-nng/container-tag.yaml rename to docker/bldr-ubuntu18-c-go/container-tag.yaml