Skip to content
Snippets Groups Projects
Verified Commit 21e3d534 authored by David Beniamine's avatar David Beniamine
Browse files

WIP everything from git

parent 68c7873d
No related branches found
No related tags found
2 merge requests!17Resolve "Build dependencies from POC",!16Resolve "Build dependencies from POC"
FROM debian:stable-slim #FROM debian:stable-slim
RUN apt-get update && apt-get install -y git npm FROM node:14 as mirador
RUN useradd --home-dir /opt node RUN apt-get update && apt-get install -y git
#RUN useradd --home-dir /opt node
RUN chown node:node /opt RUN chown node:node /opt
EXPOSE 9000 EXPOSE 9000
WORKDIR /opt WORKDIR /opt
USER node USER node
# TODO other command in production
CMD npm run serve CMD npm run serve
FROM caddy:latest as httpd
Subproject commit ed51af7660816416b9b5b2df73b2648fa0fbcb4f Subproject commit a1e2371bcb8d4fa41e77767d70ea0e6052d586a0
version: "3.3" version: "3.3"
services: services:
devserver: mirador:
build:
context: .
dockerfile: Dockerfile.devserver
restart: $DEV_RESTART
ports: ports:
- $DEV_PORT:9000 - $DEV_PORT:9000
environment: environment:
- CORS_ALLOWED_HOSTS
- WEBPACK_MODE=development - WEBPACK_MODE=development
- HTTP_FOLDER
- DEV_PORT
volumes:
- ./:/opt
httpd: httpd:
ports: ports:
......
version: "3.3" version: "3.3"
services: services:
httpd: mirador:
build: . build:
context: .
dockerfile: Dockerfile.devserver
target: mirador
restart: $RESTART restart: $RESTART
environment: environment:
- CORS_ALLOWED_HOSTS - CORS_ALLOWED_HOSTS
- WEBPACK_MODE=production - HTTP_FOLDER
- DEV_PORT
volumes: volumes:
- $HTTP_FOLDER:/srv/data - $HTTP_FOLDER:/srv/data
- ./Caddyfile:/etc/caddy/Caddyfile - ./Caddyfile:/etc/caddy/Caddyfile
- ./:/opt
httpd:
build:
context: .
dockerfile: Dockerfile.devserver
target: httpd
annotot: annotot:
image: tetraslibre/annotot-app image: tetraslibre/annotot-app
......
This diff is collapsed.
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
"dependencies": { "dependencies": {
"css-loader": "^3.6.0", "css-loader": "^3.6.0",
"dotenv-webpack": "^8.0.1", "dotenv-webpack": "^8.0.1",
"mirador": "file:mirador-video-annotation", "mirador": "git+https://gitlab.tetras-libre.fr/iiif/mirador-video-annotation#annotation-on-video",
"mirador-annotations": "file:annotations-plugin", "mirador-annotations": "git+gitlab@gitlab.tetras-libre.fr:iiif/mirador-annotations.git#dependencies-from-git",
"react": "^16.13.1", "react": "^16.13.1",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"style-loader": "^1.2.1" "style-loader": "^1.2.1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment