From 8d38b3c6aff851c1ae6d44b7d743654cf0bfdba2 Mon Sep 17 00:00:00 2001 From: dougbtv Date: Mon, 27 Aug 2018 16:55:46 -0400 Subject: [PATCH] [dockerfile] Moves Dockerfile to root --- .travis.yml | 2 +- images/Dockerfile => Dockerfile | 0 images/README.md | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename images/Dockerfile => Dockerfile (100%) diff --git a/.travis.yml b/.travis.yml index e02cedc44..f117fff72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ script: - $GOPATH/bin/goveralls -coverprofile=coverage.out -service=travis-ci - mkdir -p ${TRAVIS_BUILD_DIR}/dist - tar cvfz ${TRAVIS_BUILD_DIR}/dist/multus-cni_amd64.tar.gz --warning=no-file-changed --exclude="dist" --exclude="vendor" . - - docker build -t nfvpe/multus -f ./images/Dockerfile . + - docker build -t nfvpe/multus . before_deploy: - go get -u github.com/laher/goxc diff --git a/images/Dockerfile b/Dockerfile similarity index 100% rename from images/Dockerfile rename to Dockerfile diff --git a/images/README.md b/images/README.md index ec647d7c7..e16f4106f 100644 --- a/images/README.md +++ b/images/README.md @@ -2,10 +2,10 @@ This is used for distribution of Multus in a Docker image. -Typically you'd build this from the root of your Multus clone, and you'd set the `-f` flag to specify the Dockerfile during build time. This allows the addition of the entirety of the Multus git clone as part of the Docker context. Use the `-f` flag with the root of the clone as the context (e.g. your current work directory would be root of git clone), such as: +Typically you'd build this from the root of your Multus clone, as such: ``` -$ docker build -t dougbtv/multus -f ./images/Dockerfile . +$ docker build -t dougbtv/multus . ``` ---