Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Commit

Permalink
[0.5.0] Git ignore copied license and notice and port #738 (#740)
Browse files Browse the repository at this point in the history
* gitignore license and notice

* Move LICENSE & NOTICE.md files

* fix buildah url
  • Loading branch information
josephca authored Oct 18, 2019
1 parent d838267 commit 848126d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions src/performance/Dockerfile_x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./

Expand Down
4 changes: 2 additions & 2 deletions src/pfe/Dockerfile_x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 848126d

Please sign in to comment.