Merge branch 'develop' into feat/add-webid-server

netwerk-digitaal-erfgoed · Dec 17, 2021 · f841e60 · f841e60
2 parents 308e569 + 565f7a7
commit f841e60
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 1 deletion.
diff --git a/packages/solid-crs-id-proxy/package-lock.json b/packages/solid-crs-id-proxy/package-lock.json
diff --git a/packages/solid-crs-id-proxy/package.json b/packages/solid-crs-id-proxy/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "start": "dgt-id-proxy",
     "start:watch": "npm run start -- -u http://localhost:3006/ -U https://nde.eu.auth0.com/ -m . -c config/local-config.json -o assets/openid-configuration.json -j assets/jwks.json",
+    "build": "shx rm -rf assets && shx mkdir assets && npm run generate:oidc && npm run generate:keys",
     "lint:staged": "lint-staged",
     "generate:oidc": "node scripts/generate-openid-configuration.js https://nde.eu.auth0.com/ http://localhost:3006/ assets/openid-configuration.json local",
     "generate:keys": "node scripts/generate-keys.js assets/jwks.json"
@@ -40,7 +41,7 @@
     "jest": "^26.6.3",
     "jest-coverage-thresholds-bumper": "0.0.4",
     "lint-staged": "^10.5.4",
-    "rimraf": "^3.0.2",
+    "shx": "^0.3.3",
     "ts-jest": "^26.5.4",
     "ts-node": "^9.1.1",
     "typescript": "^4.2.3"

diff --git a/packages/solid-crs-manage/Dockerfile b/packages/solid-crs-manage/Dockerfile
@@ -1,6 +1,7 @@
 FROM node:14-alpine AS build
 ARG NPM_TOKEN
 WORKDIR /usr/src/app
+COPY nginx.conf ./
 COPY package*.json ./
 COPY .npmrc ./
 RUN echo "//npm.pkg.github.com/:_authToken=$NPM_TOKEN" >> .npmrc && \
@@ -12,5 +13,6 @@ RUN npm run build
 FROM nginx:stable-alpine
 LABEL org.opencontainers.image.source=https://github.com/netwerk-digitaal-erfgoed/solid-crs
 COPY --from=build /usr/src/app/dist /usr/share/nginx/html
+COPY --from=build /usr/src/app/nginx.conf /etc/nginx/conf.d/default.conf
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/packages/solid-crs-manage/nginx.conf b/packages/solid-crs-manage/nginx.conf
@@ -0,0 +1,12 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+
+
+    location / {
+        root   /usr/share/nginx/html;
+        try_files $uri /index.html; 
+    }
+
+}