Skip to content

Commit

Permalink
Merge pull request #65 from camicroscope/develop
Browse files Browse the repository at this point in the history
For 3.8.4
  • Loading branch information
birm authored Jan 25, 2021
2 parents 2a5be46 + 2bfb3c8 commit d65d05a
Show file tree
Hide file tree
Showing 4 changed files with 146 additions and 61 deletions.
12 changes: 9 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
FROM node:14-stretch-slim
RUN apt-get update && apt-get upgrade -y && apt-get install -y git build-essential python3
RUN mkdir /root/src
COPY . /root/src
WORKDIR /root/src
RUN mkdir /src
COPY . /src
WORKDIR /src
RUN npm install
ARG viewer
ARG fork
RUN git clone https://github.com/${fork:-camicroscope}/camicroscope.git --branch=${viewer:-master}
EXPOSE 8010

RUN chgrp -R 0 /src && \
chmod -R g+rwX /src

USER 1001

CMD node caracal.js
166 changes: 109 additions & 57 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"http-proxy-middleware": "^0.20.0",
"inkjet": "^2.1.2",
"jsonwebtoken": "^8.5.1",
"jwks-rsa": "^1.6.0",
"jwks-rsa": "^1.12.1",
"mongodb": "^3.3.5",
"throng": "^4.0.0"
},
Expand Down
27 changes: 27 additions & 0 deletions routes.json
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,33 @@
{"function":"permissionHandler", "args": [["Admin", "Editor"]]},
{"function":"mongoUpdate", "args": ["camic", "configuration"]}
]
},{
"route":"/data/Collection/find",
"method":"get",
"handlers":[
{"function":"mongoFind", "args": ["camic", "collection"]}
]
},{
"route":"/data/Collection/post",
"method":"post",
"handlers":[
{"function":"permissionHandler", "args": [["Admin", "Editor"]]},
{"function":"mongoAdd", "args": ["camic", "collection"]}
]
},{
"route":"/data/Collection/update",
"method":"post",
"handlers":[
{"function":"permissionHandler", "args": [["Admin", "Editor"]]},
{"function":"mongoUpdate", "args": ["camic", "collection"]}
]
},{
"route":"/data/Collection/delete",
"method":"delete",
"handlers":[
{"function":"permissionHandler", "args": [["Admin", "Editor"]]},
{"function":"mongoDelete", "args": ["camic", "collection"]}
]
},

{
Expand Down

0 comments on commit d65d05a

Please sign in to comment.