From fec835ece3bc202b40687696caf650dc997cdcc7 Mon Sep 17 00:00:00 2001 From: "E. Scott Daniels" Date: Thu, 30 Apr 2020 15:20:33 -0400 Subject: [PATCH] Dockerfile corrections Remove stray comments and bad copy. Issue-ID: RIC-349 Signed-off-by: E. Scott Daniels Change-Id: I41718566a3235af7958b9fc20e6996fd902a37fe --- Dockerfile | 5 ----- container-tag.yaml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1260ecd..6201076 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,8 +90,6 @@ COPY assets/bootstrap.rt /playpen/assets # ----- create final, smaller, image ---------------------------------- FROM ubuntu:18.04 -# if bash doesn't cut it for something, grab ksh, then clean up as much as possible -#RUN apt-get update; apt-get install -y ksh RUN rm -fr /var/lib/apt/lists # snarf the various sdl, rmr, and cpp-framework libraries as well as any binaries @@ -99,7 +97,6 @@ RUN rm -fr /var/lib/apt/lists # COPY --from=buildenv /usr/local/lib /usr/local/lib/ COPY --from=buildenv /usr/local/bin/rmr_probe /usr/local/bin/ts_xapp /usr/local/bin/ -COPY --from=buildenv /usr/lib /usr/lib/ COPY --from=buildenv /playpen/bin /usr/local/bin/ COPY --from=buildenv /playpen/assets /data @@ -107,8 +104,6 @@ COPY --from=buildenv /playpen/assets /data ENV PATH=/usr/local/bin:$PATH ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib -#ENV RMR_SEED_RT="routes.txt" - WORKDIR /data COPY --from=buildenv /playpen/assets/* /data diff --git a/container-tag.yaml b/container-tag.yaml index f04677f..252b070 100644 --- a/container-tag.yaml +++ b/container-tag.yaml @@ -1,3 +1,3 @@ # this is used by CI jobs to apply a tag when it builds the image --- -tag: '1.0.0' +tag: '1.0.1' -- 2.16.6