From 848126d691ff8c9f3b2e0574098c249902b6301e Mon Sep 17 00:00:00 2001
From: Joseph Kim <25185698+josephca@users.noreply.github.com>
Date: Fri, 18 Oct 2019 11:01:01 -0400
Subject: [PATCH] [0.5.0] Git ignore copied license and notice and port #738
 (#740)

* gitignore license and notice

* Move LICENSE & NOTICE.md files

* fix buildah url
---
 .gitignore                        |  7 +++----
 src/performance/Dockerfile_x86_64 | 14 +++++++-------
 src/pfe/Dockerfile_x86_64         |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index e90324114..228b56688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,10 +14,9 @@ package-lock.json
 src/performance/webclient/build/
 test/test-results.xml
 test/tmp.json
-src/performance/LICENSE.md
+src/performance/LICENSE
 src/performance/NOTICE.md
-src/pfe/portal/LICENSE.md
+src/pfe/portal/LICENSE
 src/pfe/portal/NOTICE.md
+src/initialize/LICENSE
 src/initialize/NOTICE.md
-src/initialize/LICENSE/LICENSE.md
-src/initialize/LICENSE/NOTICE.md
diff --git a/src/performance/Dockerfile_x86_64 b/src/performance/Dockerfile_x86_64
index b2128be04..9de914a0f 100644
--- a/src/performance/Dockerfile_x86_64
+++ b/src/performance/Dockerfile_x86_64
@@ -22,30 +22,30 @@ COPY . .
 
 
 ##############################################
-# Build the performance dashboard (Codewind) 
+# Build the performance dashboard (Codewind)
 ##############################################
 
 WORKDIR /usr/src/app/dashboard
 
-# Install nodeJS dependancies
+# Install nodeJS dependencies
 RUN npm install
 
-# Build React webapp 
+# Build React webapp
 RUN npm run build
 
 
 ############################################################
-# We now have a built ui, begin setup of a new runtime image 
+# We now have a built ui, begin setup of a new runtime image
 ############################################################
 
 FROM node:10-alpine
 
-# Copy our license files into the new image
-COPY LICENSE NOTICE.md /
-
 # Create app directory
 WORKDIR /usr/src/app
 
+# Copy our license files into the new image
+COPY LICENSE NOTICE.md ./
+
 # Install performance server
 COPY package*.json server.js ./
 
diff --git a/src/pfe/Dockerfile_x86_64 b/src/pfe/Dockerfile_x86_64
index 8792e71e2..dba7102dc 100644
--- a/src/pfe/Dockerfile_x86_64
+++ b/src/pfe/Dockerfile_x86_64
@@ -146,8 +146,8 @@ COPY --from=codewind-pfe-portal /portal /portal
 
 # Copy the license files to the root directory
 # to satisfy requirement from legal
-COPY /portal/LICENSE /LICENSE
-COPY /portal/NOTICE.md /LICENSE
+COPY /portal/LICENSE /
+COPY /portal/NOTICE.md /
 
 WORKDIR /portal
 ARG NODE_ENV