From e0b517efc14064c8a3bfc56e891a796fd6006e8c Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Fri, 14 Jun 2019 10:11:06 -0400 Subject: [PATCH] Remove Debian bases with c, go tools Signed-off-by: Lott, Christopher (cl778h) Change-Id: Ic49688d461b07974a9151bc019b2048e94214433 --- docker/bldr-ric-alpine-c/Dockerfile | 38 --------------------------- docker/bldr-ric-alpine-c/container-tag.yaml | 2 -- docker/bldr-ric-alpine-go/Dockerfile | 39 ---------------------------- docker/bldr-ric-alpine-go/container-tag.yaml | 2 -- docker/bldr-ric-debian-c/Dockerfile | 38 --------------------------- docker/bldr-ric-debian-c/container-tag.yaml | 2 -- docker/bldr-ric-debian-go/Dockerfile | 38 --------------------------- docker/bldr-ric-debian-go/container-tag.yaml | 2 -- 8 files changed, 161 deletions(-) delete mode 100644 docker/bldr-ric-alpine-c/Dockerfile delete mode 100644 docker/bldr-ric-alpine-c/container-tag.yaml delete mode 100644 docker/bldr-ric-alpine-go/Dockerfile delete mode 100644 docker/bldr-ric-alpine-go/container-tag.yaml delete mode 100644 docker/bldr-ric-debian-c/Dockerfile delete mode 100644 docker/bldr-ric-debian-c/container-tag.yaml delete mode 100644 docker/bldr-ric-debian-go/Dockerfile delete mode 100644 docker/bldr-ric-debian-go/container-tag.yaml diff --git a/docker/bldr-ric-alpine-c/Dockerfile b/docker/bldr-ric-alpine-c/Dockerfile deleted file mode 100644 index fc9672b9..00000000 --- a/docker/bldr-ric-alpine-c/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# O-RAN-SC -# -# Copyright (C) 2019 AT&T Intellectual Property and Nokia -# -# 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. - -# Builder image: Alpine 3.9 -# standard packages: C/C++, cmake, etc. -# RIC libraries: mcdlog (TODO), rmr - -FROM alpine:3.9 -RUN apk update && apk add \ - autoconf \ - automake \ - build-base \ - cmake \ - libtool \ - pkgconfig \ - git - -# MCDLOG version 0.0.2, not pinned -# fails to build in Alpine -#RUN cd /tmp && git clone https://gerrit.o-ran-sc.org/r/com/log \ -# && cd log && ./autogen.sh && ./configure && make && make install - -# RMR version 1.0.24 -RUN cd /tmp && git clone https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \ - && cd rmr && git checkout a012cf63dfdad3656c995cb06c316fd208c63b98 && cmake . && make install diff --git a/docker/bldr-ric-alpine-c/container-tag.yaml b/docker/bldr-ric-alpine-c/container-tag.yaml deleted file mode 100644 index c3122450..00000000 --- a/docker/bldr-ric-alpine-c/container-tag.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -tag: a3.9-l0.0.2-r1.0.24 diff --git a/docker/bldr-ric-alpine-go/Dockerfile b/docker/bldr-ric-alpine-go/Dockerfile deleted file mode 100644 index 426d54c1..00000000 --- a/docker/bldr-ric-alpine-go/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# O-RAN-SC -# -# Copyright (C) 2019 AT&T Intellectual Property and Nokia -# -# 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. - -# Builder image: Alpine 3.9 -# standard packages: Go/C++, cmake, etc. -# RIC libraries: mcdlog (TODO), rmr - -FROM alpine:3.9 -RUN apk update && apk add \ - autoconf \ - automake \ - build-base \ - cmake \ - libtool \ - pkgconfig \ - git \ - go - -# MCDLOG version 0.0.2, not pinned -# fails to build in Alpine -#RUN cd /tmp && git clone https://gerrit.o-ran-sc.org/r/com/log \ -# && cd log && ./autogen.sh && ./configure && make && make install - -# RMR version 1.0.24 -RUN cd /tmp && git clone https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \ - && cd rmr && git checkout a012cf63dfdad3656c995cb06c316fd208c63b98 && cmake . && make install diff --git a/docker/bldr-ric-alpine-go/container-tag.yaml b/docker/bldr-ric-alpine-go/container-tag.yaml deleted file mode 100644 index 61afe685..00000000 --- a/docker/bldr-ric-alpine-go/container-tag.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -tag: a3.9-g1.11-l0.0.2-r1.0.24 diff --git a/docker/bldr-ric-debian-c/Dockerfile b/docker/bldr-ric-debian-c/Dockerfile deleted file mode 100644 index ea3e84f9..00000000 --- a/docker/bldr-ric-debian-c/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# O-RAN-SC -# -# Copyright (C) 2019 AT&T Intellectual Property and Nokia -# -# 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. - -# Builder image: Debian stretch -# standard packages: C/C++, cmake, etc. -# RIC libraries: mcdlog, rmr -# inherits C and C++ tools from buildpack-deps:stretch - -FROM buildpack-deps:stretch - -RUN apt-get update && apt-get -q -y install \ - autoconf \ - autoconf-archive \ - automake \ - cmake \ - libtool \ - pkg-config - -# version 0.0.2, not pinned -RUN cd /tmp && git clone https://gerrit.o-ran-sc.org/r/com/log \ - && cd log && ./autogen.sh && ./configure && make && make install - -# version 1.0.24 -RUN cd /tmp && git clone https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \ - && cd rmr && git checkout a012cf63dfdad3656c995cb06c316fd208c63b98 && cmake . && make install diff --git a/docker/bldr-ric-debian-c/container-tag.yaml b/docker/bldr-ric-debian-c/container-tag.yaml deleted file mode 100644 index d1ccc1b4..00000000 --- a/docker/bldr-ric-debian-c/container-tag.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -tag: stretch-l0.0.2-r1.0.24 diff --git a/docker/bldr-ric-debian-go/Dockerfile b/docker/bldr-ric-debian-go/Dockerfile deleted file mode 100644 index 157fd043..00000000 --- a/docker/bldr-ric-debian-go/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# O-RAN-SC -# -# Copyright (C) 2019 AT&T Intellectual Property and Nokia -# -# 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. - -# Builder image: Debian stretch -# standard packages: Go, cmake, etc. -# RIC libraries: mcdlog, rmr -# inherits C and C++ tools from buildpack-deps:stretch - -FROM golang:1.12 - -RUN apt-get update && apt-get -q -y install \ - autoconf \ - autoconf-archive \ - automake \ - cmake \ - libtool \ - pkg-config - -# version 0.0.2, not pinned -RUN cd /tmp && git clone https://gerrit.o-ran-sc.org/r/com/log \ - && cd log && ./autogen.sh && ./configure && make && make install - -# version 1.0.24 -RUN cd /tmp && git clone https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \ - && cd rmr && git checkout a012cf63dfdad3656c995cb06c316fd208c63b98 && cmake . && make install diff --git a/docker/bldr-ric-debian-go/container-tag.yaml b/docker/bldr-ric-debian-go/container-tag.yaml deleted file mode 100644 index 09e9f56b..00000000 --- a/docker/bldr-ric-debian-go/container-tag.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -tag: stretch-g1.12-l0.0.2-r1.0.24 -- 2.16.6