diff --git a/app/javascript/components/video_player.jsx b/app/javascript/components/video_player.jsx
index 1bd798d4..31a026c9 100644
--- a/app/javascript/components/video_player.jsx
+++ b/app/javascript/components/video_player.jsx
@@ -32,7 +32,7 @@ export default class VideoPlayer extends Component{
width: 800,
baseUrl: '/assets/clappr',
parent: this.refs.player,
- hlsjsConfig: { enableWorker: true },
+ hlsjsConfig: { enableWorker: true }
})
this.setState({ player: player })
@@ -69,8 +69,7 @@ export default class VideoPlayer extends Component{
render() {
return (
-
-
+
)
}
}
diff --git a/db/seeds.rb b/db/seeds.rb
index cb0bbbe9..d39836b2 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -14,14 +14,6 @@
# Import the work with the video
OralHistoryItem.import_single("21198-zz002jxz7z")
- # Import additional works with audio
+ # Import additional works with audio
OralHistoryItem.import_single("21198-zz002bfs89")
- OralHistoryItem.import_single("21198-zz002kd7t9")
- OralHistoryItem.import_single("21198-zz002gvzsh")
-
- #https://webservices.library.ucla.edu/dldataprovider/oai2_0.do?metadataPrefix=mods&verb=GetRecord&identifier=oai:library.ucla.edu:digital2/21198-zz00096t7z
- OralHistoryItem.import_single("21198-zz00096t7z")
- OralHistoryItem.import_single("21198-zz002czx49")
- OralHistoryItem.import_single("21198-zz000904cp")
- OralHistoryItem.import_single("21198-zz00096th3")
end
diff --git a/docker-compose.yml b/docker-compose.yml
index 8711498e..ade883f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,22 +11,18 @@ services:
- 'postgres:/var/lib/postgresql/data'
solr:
- build: ./solr
+ build: solr/
ports:
- - "8983:8983"
+ - '8983:8983'
environment:
- SOLR_HEAP=4g
- - SOLR_HOME=/solr_home
- - SOLR_CONFIG_DIR=/solr_conf
volumes:
- solr:/solr_home
web:
build:
context: .
- target: web
- cache_from:
- - "${REGISTRY_HOST}${REGISTRY_URI}/oral-history:${TAG}"
+ dockerfile: Dockerfile
image: "${REGISTRY_HOST}${REGISTRY_URI}/oral-history:${TAG}"
env_file:
- .env
@@ -42,7 +38,7 @@ services:
- "${DOCKER_PORTS}"
- "8000:80"
environment:
- - VIRTUAL_HOST=oralhistory.test
+ - VIRTUAL_HOST=oralhistory.docker
- VIRTUAL_PORT=80
depends_on:
- postgres
@@ -52,7 +48,8 @@ services:
worker:
build:
context: .
- target: web
+ dockerfile: Dockerfile
+ image: "${REGISTRY_HOST}${REGISTRY_URI}/oral-history:${TAG}"
env_file:
- .env
- .env.development
@@ -65,4 +62,4 @@ services:
volumes:
postgres:
- solr:
\ No newline at end of file
+ solr: