Merge branch '1_basic_docker_stack' into 'main'

Basic docker stack to build and serve Mirador See merge request iiif/POC-mirador!2

Merge branch '1_basic_docker_stack' into 'main'
53d2f977 · David Beniamine · 3f9543b4 · 741a421f · 53d2f977 · 53d2f977
Commit 53d2f977 authored 2 years ago by David Beniamine
--- a/.env.template
+++ b/.env.template
+# host port
+PORT=
+# container restart policy
+RESTART=
--- a/.gitignore
+++ b/.gitignore
+.env
 node_modules/
 dist/
 package-lock.json

--- a/Caddyfile
+++ b/Caddyfile
+:80 {
+  root * /srv
+  file_server browse
+}
--- a/Dockerfile
+++ b/Dockerfile
+FROM alpine:latest as builder
+RUN apk add npm git
+
+COPY . /opt
+WORKDIR /opt
+RUN npm install
+RUN npm run build
+
+FROM caddy:latest as httpd
+COPY --from=builder /opt/public /srv
--- a/README.md
+++ b/README.md
-## Integrating Mirador
+## Mirador Video Annotation POC

-This repository is designed to show integrating Mirador 3 with modern frontend build systems.
-
-### Dependencies
-
-You will likely need to have at least the following dependencies available in your `package.json`.
-
- - `mirador`
- - `react`
- - `react-dom`
- - `mirador-image-tools` - A plugin just to test plugin integration
-
-### Webpack
-
-See `./webpack` for a basic webpack setup for Mirador 3 + a plugin.
-
-```sh
-npm run webpack
-```
-
-### Parcel
-
-See `./parcel`, but essentially it is just an html file referencing the JavaScript.
-
-```sh
-npm run parcel
-```
+Run `docker-compose up -d`, which will serve a mirador instance to `http://localhost:8080`. If sources files are modified, run `docker-compose up -d --build`
--- a/docker-compose.yml
+++ b/docker-compose.yml
+version: "3.9"
+services:
+  httpd:
+    build: .
+    restart: $RESTART
+    ports:
+      - $PORT:80
+    volumes:
+      - ./Caddyfile:/etc/caddy/Caddyfile
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
  "description": "",
  "private": true,
  "scripts": {
-    "webpack": "webpack --config webpack/webpack.config.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "build": "webpack --config webpack.config.js",
+    "serve": "webpack serve --config webpack.config.js"
  },
  "author": "",
  "license": "ISC",
@@ -14,7 +14,9 @@
    "mirador": "git+https://gitlab.tetras-libre.fr/iiif/mirador-video-annotation#wip-webpack-from-git",
    "react": "^16.13.1",
    "react-dom": "^16.13.1",
-    "style-loader": "^1.2.1",
+    "style-loader": "^1.2.1"
+  },
+  "devDependencies": {
    "webpack": "^4.43.0",
    "webpack-cli": "^4.3.12"
  }

--- a/webpack/index.html
+++ b/webpack/index.html
@@ -2,10 +2,10 @@
 <html>
  <head>
    <meta charset="utf-8" />
-    <title>Basic Mirador</title>
+    <title>Mirador Video Annotations</title>
  </head>
  <body>
    <div id="demo"></div>
-    <script src="dist/main.js"></script>
+    <script src="/dist/main.js"></script>
  </body>
 </html>
--- a/webpack/webpack.config.js
+++ b/webpack/webpack.config.js
@@ -4,7 +4,7 @@ module.exports = {
  entry: './src/index.js',
  output: {
    filename: 'main.js',
-    path: path.resolve(__dirname, 'dist'),
+    path: path.resolve(__dirname, 'public/dist'),
    publicPath: './dist/',
-  },
+  }
 };