From fe2bd3618e4748333078f91c26a8a3f5dcf184c4 Mon Sep 17 00:00:00 2001 From: "E. Scott Daniels" Date: Tue, 29 Oct 2019 09:05:21 -0400 Subject: [PATCH] Reorganise the sidecars The sidecar directory formally under src/ is moved to the top level. The docker file originally at the top level is moved to the listener directory in the new sidecar directory as it only builds an image for running the listener. Signed-off-by: E. Scott Daniels Change-Id: Idd05de886af1fd5dea587e22ff00d234e49a555c --- {src/sidecars => sidecars}/listener/.gitignore | 0 sidecars/listener/Dockerfile | 49 ++++++++++++++++++++++ {src/sidecars => sidecars}/listener/Makefile | 0 {src/sidecars => sidecars}/listener/README | 0 {src/sidecars => sidecars}/listener/TESTING | 0 .../listener/build_dev_env.sh | 0 .../sidecars => sidecars}/listener/build_images.sh | 0 {src/sidecars => sidecars}/listener/mc_listener.c | 0 {src/sidecars => sidecars}/listener/mcl.c | 0 {src/sidecars => sidecars}/listener/mcl.h | 0 {src/sidecars => sidecars}/listener/mcl_dev.df | 0 {src/sidecars => sidecars}/listener/mcl_runtime.df | 0 {src/sidecars => sidecars}/listener/pipe_reader.c | 0 {src/sidecars => sidecars}/listener/rdc.c | 0 {src/sidecars => sidecars}/listener/sender.c | 0 {src/sidecars => sidecars}/listener/unit_test.c | 0 {src/sidecars => sidecars}/listener/verify.sh | 0 17 files changed, 49 insertions(+) rename {src/sidecars => sidecars}/listener/.gitignore (100%) create mode 100644 sidecars/listener/Dockerfile rename {src/sidecars => sidecars}/listener/Makefile (100%) rename {src/sidecars => sidecars}/listener/README (100%) rename {src/sidecars => sidecars}/listener/TESTING (100%) rename {src/sidecars => sidecars}/listener/build_dev_env.sh (100%) rename {src/sidecars => sidecars}/listener/build_images.sh (100%) rename {src/sidecars => sidecars}/listener/mc_listener.c (100%) rename {src/sidecars => sidecars}/listener/mcl.c (100%) rename {src/sidecars => sidecars}/listener/mcl.h (100%) rename {src/sidecars => sidecars}/listener/mcl_dev.df (100%) rename {src/sidecars => sidecars}/listener/mcl_runtime.df (100%) rename {src/sidecars => sidecars}/listener/pipe_reader.c (100%) rename {src/sidecars => sidecars}/listener/rdc.c (100%) rename {src/sidecars => sidecars}/listener/sender.c (100%) rename {src/sidecars => sidecars}/listener/unit_test.c (100%) rename {src/sidecars => sidecars}/listener/verify.sh (100%) diff --git a/src/sidecars/listener/.gitignore b/sidecars/listener/.gitignore similarity index 100% rename from src/sidecars/listener/.gitignore rename to sidecars/listener/.gitignore diff --git a/sidecars/listener/Dockerfile b/sidecars/listener/Dockerfile new file mode 100644 index 0000000..14f0ba9 --- /dev/null +++ b/sidecars/listener/Dockerfile @@ -0,0 +1,49 @@ +# vim: ts=4 sw=4 noet: + +# ------------------------------------------------------------------------------- +# Copyright (c) 2018-2019 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. +# ------------------------------------------------------------------------------- + +# CAUTION: This file eventually should exist in the ci directory, however until +# this can be confirmed, and the .yaml file(s) in the ci project changed +# to indicaate that ci/Dockerfile should be used, this is here with minor +# changes needed to exist at the root. +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# CI to verify the MC application components +# Inherits C toolchain from buildpack-deps:stretch then adds cmake and better shell(s). + +# It is assumed that this docker file is used with a build command run at the +# root level of the repo (directory containing the ci directory). E.g. +# docker build -f ci/Dockerfile . + +FROM buildpack-deps:stretch + +RUN apt-get update && apt-get -q -y install cmake ksh + +# stuff our repo things into a scratch area +RUN mkdir /playpen +ADD . /playpen + + +# add any unit test scripts that need to be driven, e.g. +# RUN ksh test/mcl_unit_test.ksh + +# This is a final/only script which might print useful things to the log and ALWAYS succeeds. +RUN ksh /playpen/ci/stats.ksh + +# there is no cmd; the build/verification assumes that if the image is created +# successfully, e.g. none of the previous run commands fail, that the environment +# is successfully vetted. diff --git a/src/sidecars/listener/Makefile b/sidecars/listener/Makefile similarity index 100% rename from src/sidecars/listener/Makefile rename to sidecars/listener/Makefile diff --git a/src/sidecars/listener/README b/sidecars/listener/README similarity index 100% rename from src/sidecars/listener/README rename to sidecars/listener/README diff --git a/src/sidecars/listener/TESTING b/sidecars/listener/TESTING similarity index 100% rename from src/sidecars/listener/TESTING rename to sidecars/listener/TESTING diff --git a/src/sidecars/listener/build_dev_env.sh b/sidecars/listener/build_dev_env.sh similarity index 100% rename from src/sidecars/listener/build_dev_env.sh rename to sidecars/listener/build_dev_env.sh diff --git a/src/sidecars/listener/build_images.sh b/sidecars/listener/build_images.sh similarity index 100% rename from src/sidecars/listener/build_images.sh rename to sidecars/listener/build_images.sh diff --git a/src/sidecars/listener/mc_listener.c b/sidecars/listener/mc_listener.c similarity index 100% rename from src/sidecars/listener/mc_listener.c rename to sidecars/listener/mc_listener.c diff --git a/src/sidecars/listener/mcl.c b/sidecars/listener/mcl.c similarity index 100% rename from src/sidecars/listener/mcl.c rename to sidecars/listener/mcl.c diff --git a/src/sidecars/listener/mcl.h b/sidecars/listener/mcl.h similarity index 100% rename from src/sidecars/listener/mcl.h rename to sidecars/listener/mcl.h diff --git a/src/sidecars/listener/mcl_dev.df b/sidecars/listener/mcl_dev.df similarity index 100% rename from src/sidecars/listener/mcl_dev.df rename to sidecars/listener/mcl_dev.df diff --git a/src/sidecars/listener/mcl_runtime.df b/sidecars/listener/mcl_runtime.df similarity index 100% rename from src/sidecars/listener/mcl_runtime.df rename to sidecars/listener/mcl_runtime.df diff --git a/src/sidecars/listener/pipe_reader.c b/sidecars/listener/pipe_reader.c similarity index 100% rename from src/sidecars/listener/pipe_reader.c rename to sidecars/listener/pipe_reader.c diff --git a/src/sidecars/listener/rdc.c b/sidecars/listener/rdc.c similarity index 100% rename from src/sidecars/listener/rdc.c rename to sidecars/listener/rdc.c diff --git a/src/sidecars/listener/sender.c b/sidecars/listener/sender.c similarity index 100% rename from src/sidecars/listener/sender.c rename to sidecars/listener/sender.c diff --git a/src/sidecars/listener/unit_test.c b/sidecars/listener/unit_test.c similarity index 100% rename from src/sidecars/listener/unit_test.c rename to sidecars/listener/unit_test.c diff --git a/src/sidecars/listener/verify.sh b/sidecars/listener/verify.sh similarity index 100% rename from src/sidecars/listener/verify.sh rename to sidecars/listener/verify.sh -- 2.16.6