From 4a74f93efaca4bf0a78ea1710e14662444dd8d65 Mon Sep 17 00:00:00 2001 From: William Douglas Date: Fri, 22 Mar 2019 11:27:29 -0700 Subject: [PATCH] Remove clrtrust generate workaround --- clr-installer-ci/Dockerfile | 6 ++---- mixer-ci/Dockerfile | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/clr-installer-ci/Dockerfile b/clr-installer-ci/Dockerfile index 5ffa87a..4fc1d21 100644 --- a/clr-installer-ci/Dockerfile +++ b/clr-installer-ci/Dockerfile @@ -4,10 +4,8 @@ MAINTAINER mark.d.horn@intel.com # Configure Go ENV GOPATH="/go" PATH="/go/bin:${PATH}" - # Configure trust -RUN clrtrust generate && \ - # Update and add bundles - swupd update && \ +# Update and add bundles +RUN swupd update && \ swupd bundle-add sysadmin-basic storage-utils network-basic go-basic-dev git telemetrics os-installer && \ # Install the Go Linters go get -u gopkg.in/alecthomas/gometalinter.v2 && \ diff --git a/mixer-ci/Dockerfile b/mixer-ci/Dockerfile index 6a1b313..6cdfa14 100644 --- a/mixer-ci/Dockerfile +++ b/mixer-ci/Dockerfile @@ -9,8 +9,7 @@ ENV PATH="/home/clr/go/bin:${PATH}" RUN swupd update && \ swupd bundle-add mixer go-basic c-basic os-core-update-dev && \ useradd -G wheelnopw clr && \ - mkdir -p /run/lock && \ - clrtrust generate + mkdir -p /run/lock USER clr RUN git config --global user.email "travis@example.com" && \ git config --global user.name "Travis CI" && \