Skip to content

Commit 006dffe

Browse files
authored
Merge pull request #133 from oslabs-beta/revert-132-AH/container
Revert "Containering in progress..."
2 parents 2420c73 + cdbaa92 commit 006dffe

File tree

3 files changed

+5
-42
lines changed

3 files changed

+5
-42
lines changed

Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
FROM node:18.12.1
1+
FROM node
22
WORKDIR /
33
COPY ./ /
4-
RUN npm install --force
5-
EXPOSE 3000
6-
CMD [ "npm", "run", "electron"]
7-
ENTRYPOINT node ./src/server/server.ts
4+
RUN npm install
5+
CMD [ "npm", "run", "start" ]
6+

package-lock.json

Lines changed: 0 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
"jwt-simple": "^0.5.6",
113113
"mongodb": "^4.12.1",
114114
"mongosh": "^1.6.1",
115-
"node": "^19.2.0",
116115
"node-fetch": "^3.3.0",
117116
"nodemon": "^2.0.20",
118117
"prom-client": "^14.1.0",
@@ -130,6 +129,5 @@
130129
},
131130
"resolutions": {
132131
"react-error-overlay": "6.0.9"
133-
},
134-
"type": "module"
132+
}
135133
}

0 commit comments

Comments
 (0)