Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
SaschaSchwarze0 committed Apr 8, 2020
1 parent e328eab commit a046827
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 2 deletions.
6 changes: 5 additions & 1 deletion normal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ FROM node:12
COPY . /app
WORKDIR /app

RUN npm install && npm run print-http-server-version
RUN \
pwd && \
ls -l && \
npm install && \
npm run print-http-server-version

EXPOSE 8080

Expand Down
2 changes: 1 addition & 1 deletion normal/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "npm-simple",
"name": "npm-simple-normal",
"version": "0.0.1",
"description": "Simple NPM hello world",
"scripts": {
Expand Down
1 change: 1 addition & 0 deletions normal/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
</head>
<body>
<h1>Hello world</h1>
<p>npm-simple-normal</p>
</body>
</html>
18 changes: 18 additions & 0 deletions root/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM node:12

COPY . /app
WORKDIR /app

RUN \
export DEBIAN_FRONTEND=noninteractive && \
apt update && \
apt upgrade -y && \
apt install -y tree && \
pwd && \
tree && \
npm install && \
npm run print-http-server-version

EXPOSE 8080

CMD ["npm", "start"]
22 changes: 22 additions & 0 deletions root/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "npm-simple-root",
"version": "0.0.1",
"description": "Simple NPM hello world",
"scripts": {
"print-http-server-version": "http-server -v",
"start": "http-server"
},
"repository": {
"type": "git",
"url": "git+https://github.com/SaschaSchwarze0/npm-simple.git"
},
"author": "Sascha Schwarze",
"license": "ISC",
"bugs": {
"url": "https://github.com/SaschaSchwarze0/npm-simple/issues"
},
"homepage": "https://github.com/SaschaSchwarze0/npm-simple#readme",
"dependencies": {
"http-server": "^0.12.1"
}
}
10 changes: 10 additions & 0 deletions root/public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>Hello world</title>
</head>
<body>
<h1>Hello world</h1>
<p>npm-simple-root</p>
</body>
</html>

0 comments on commit a046827

Please sign in to comment.