Skip to content
Draft
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codegen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: Install dependencies
working-directory: frontend
run: npm install
run: npm install --legacy-peer-deps

- name: Run Codegen
working-directory: frontend
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,7 @@ secrets.yaml
official.csv
fact.png
jupyterhub/.env-dev

# Node and Python Environment Management
.nvmrc
.python-version
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Drag and drop upload multiple files
- Footer with links to documentation, source code, and contact information
- Documentation through MKDocs
- Visualization for Whole Slide Images (WSI) using Mirador. [#1225](https://github.com/clowder-framework/clowder2/issues/1225)

### Changed

Expand Down
28 changes: 28 additions & 0 deletions docker-compose.iiif.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
services:
# https://github.com/UCLALibrary/docker-cantaloupe
cantaloupe:
image: uclalibrary/cantaloupe:5.0.6-6
ports:
- "8182:8182"
environment:
CANTALOUPE_SOURCE_STATIC: "S3Source"
CANTALOUPE_ENDPOINT_ADMIN_SECRET: "secret"
CANTALOUPE_ENDPOINT_ADMIN_ENABLED: "false"
CANTALOUPE_S3SOURCE_LOOKUP_STRATEGY: "BasicLookupStrategy"
CANTALOUPE_S3SOURCE_BASICLOOKUPSTRATEGY_BUCKET_NAME: "cantaloupe"
CANTALOUPE_S3SOURCE_SECRET_KEY: "minioadmin"
CANTALOUPE_S3SOURCE_ACCESS_KEY_ID: "minioadmin"
CANTALOUPE_S3SOURCE_ENDPOINT: "http://minio-nginx:9000"
networks:
- clowder2
iiif-presentation-api-server:
image: iiif-presentation-api-server
ports:
- "8002:8000"
environment:
IIIF_IMAGE_API_SERVER_URL: "http://192.168.4.100:8182/iiif/3"
networks:
- clowder2
networks:
clowder2:
name: clowder2
5 changes: 4 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,10 @@ services:
minio-nginx:
image: nginx:1.19.2-alpine
restart: unless-stopped
hostname: nginx
hostname: minio-nginx
ports:
- "9000:9000"
- "9001:9001"
networks:
- clowder2
volumes:
Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ WORKDIR /usr/src/app
# copy only package for caching purposes
COPY ["package.json", "package-lock.json*", "./"]
COPY tools/ /usr/src/app/tools/
RUN npm install
RUN npm install --legacy-peer-deps

# copy rest of application
COPY .babelrc .eslintrc .istanbul.yml *.js /usr/src/app/
Expand Down
Loading