Skip to content

Commit 022da3e

Browse files
committed
improve docs and docker file
1 parent bf9eda2 commit 022da3e

File tree

5 files changed

+33
-57
lines changed

5 files changed

+33
-57
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
FROM owncloudci/nodejs:20 AS stage
2+
ARG system=Ocis
23

34
WORKDIR /extension
45

56
COPY . .
6-
RUN pnpm install
7+
RUN make install$system
78
RUN pnpm build
89

910
FROM alpine:3.20
1011
WORKDIR /app
11-
COPY --from=stage /extension/dist ./
12+
COPY --from=stage /extension/dist ./

README.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@ It allows users to:
3030

3131
### App Installation With [OpenCloud](https://github.com/opencloud-eu/opencloud/tree/main/deployments/examples/opencloud_full) or [oCIS Deployment](https://github.com/owncloud/ocis/tree/master/deployments/examples/ocis_full)
3232

33-
1. Copy [`deployments/mdpresentation-viewer.yml`](./deployments/mdpresentation-viewer.yml) into the `web_extensions`
33+
1. Copy the `yml` file for your system from [`deployments/`](./deployments/) into the `web_extensions`
3434
subfolder.
35-
2. Add `MDPRESENTATION_VIEWER=:web_extensions/mdpresentation-viewer.yml` to the `Web Extensions` section of the `.env` file of your installation and append it to the `COMPOSE_FILE` variable.
35+
2. Add `MDPRESENTATION_VIEWER=:web_extensions/mdpresentation-viewer-<your-system>.yml` to the `Web Extensions` section of the `.env` file of your installation and append it to the `COMPOSE_FILE` variable.
3636
```env
37-
## oCIS Web Extensions ##
38-
MDPRESENTATION_VIEWER=:web_extensions/mdpresentation-viewer.yml
37+
MDPRESENTATION_VIEWER=:web_extensions/mdpresentation-viewer-<your-system>.yml
3938
4039
COMPOSE_FILE=docker-compose.yml${...}${MDPRESENTATION_VIEWER:-}
4140
```
@@ -97,3 +96,16 @@ docker compose -f docker-compose-ocis.yml up
9796
```
9897

9998
server URL: [localhost:9200](https://localhost:9200)
99+
100+
## Building Docker Container
101+
102+
For OpenCloud:
103+
```bash
104+
docker build --build-arg system=Opencloud -t jankaritech/mdpresentation-viewer-opencloud:<version> .
105+
```
106+
107+
108+
For Ocis:
109+
```bash
110+
docker build --build-arg system=Ocis -t jankaritech/mdpresentation-viewer-ocis:<version> .
111+
```
File renamed without changes.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
services:
3+
opencloud:
4+
depends_on:
5+
mdpresentation-viewer:
6+
condition: service_completed_successfully
7+
8+
mdpresentation-viewer:
9+
image: jankaritech/mdpresentation-viewer-opencloud:2.1.0-rc1
10+
volumes:
11+
- opencloud-apps:/apps
12+
entrypoint:
13+
- /bin/sh
14+
command: ["-c", "cp -R /app/* /apps"]

package.json

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)