Skip to content

Commit dda49dd

Browse files
authored
Merge pull request #69 from guzman-raphael/update-deploy
Fix publish: Update deploy environment to reflect new release artifacts
2 parents 3e65b2c + 6c2314c commit dda49dd

File tree

5 files changed

+22
-8
lines changed

5 files changed

+22
-8
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
44

5-
## [0.1.0-alpha.1] - 2021-02-19
5+
## [0.1.0-alpha.2] - 2021-02-19
66
### Added
77
- Provide a database server login/logout interface. Page refresh also triggers logout.
88
- View, sort, and substring search on schemas.
@@ -17,4 +17,4 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
1717
- Multi database server connections supported by opening new tabs.
1818
- Support of DJ NEURO - [Managed Database Hosting](https://djneuro.io/services/) users.
1919

20-
[0.1.0-alpha.1]: https://github.com/datajoint/datajoint-labbook/releases/tag/0.1.0-alpha.1
20+
[0.1.0-alpha.2]: https://github.com/datajoint/datajoint-labbook/releases/tag/0.1.0-alpha.2

docker-compose-deploy.yaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
# PHARUS_VERSION=0.1.0a5 DJLABBOOK_VERSION=0.1.0-alpha.1 docker-compose -f docker-compose-deploy.yaml pull
2-
# PHARUS_VERSION=0.1.0a5 DJLABBOOK_VERSION=0.1.0-alpha.1 docker-compose -f docker-compose-deploy.yaml up -d
1+
# PHARUS_VERSION=0.1.0a5 DJLABBOOK_VERSION=0.1.0-alpha.2 docker-compose -f docker-compose-deploy.yaml pull
2+
# PHARUS_VERSION=0.1.0a5 DJLABBOOK_VERSION=0.1.0-alpha.2 docker-compose -f docker-compose-deploy.yaml up -d
33
#
44
# Intended for production deployment.
55
# Note: You must run both commands above for minimal outage.
66
# Make sure to add an entry into your /etc/hosts file as `127.0.0.1 fakeservices.datajoint.io`
77
# This serves as an alias for the domain to resolve locally.
88
# With this config and the configuration below in NGINX, you should be able to verify it is
99
# running properly by navigating in your browser to `https://fakeservices.datajoint.io`.
10+
# If you don't update your hosts file, you will still have access at `https://localhost`
11+
# however it should simply display 'Not secure' since the cert will be invalid.
1012
version: "2.4"
1113
x-net: &net
1214
networks:
@@ -27,8 +29,18 @@ services:
2729
- ADD_pharus_ENDPOINT=pharus:5000
2830
- ADD_pharus_PREFIX=/api
2931
- HTTPS_PASSTHRU=TRUE
30-
volumes:
31-
- ./build:/usr/share/nginx/html:ro
32+
entrypoint: sh
33+
command:
34+
- -c
35+
- |
36+
rm -R /usr/share/nginx/html
37+
curl -L $$(echo "https://github.com/datajoint/datajoint-labbook/releases/download/\
38+
${DJLABBOOK_VERSION}/static-djlabbook-${DJLABBOOK_VERSION}.zip" | tr -d '\n' | \
39+
tr -d '\t') -o static.zip
40+
unzip static.zip -d /usr/share/nginx
41+
mv /usr/share/nginx/build /usr/share/nginx/html
42+
rm static.zip
43+
/entrypoint.sh
3244
ports:
3345
- "443:443"
3446
- "80:80"

docker-compose-dev.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# `127.0.0.1 fakeservices.datajoint.io`. This serves as an alias for the domain to resolve
77
# locally. With this config and the configuration below in NGINX, you should be able to verify
88
# it is running properly by navigating in your browser to `https://fakeservices.datajoint.io`.
9+
# If you don't update your hosts file, you will still have access at `https://localhost`
10+
# however it should simply display 'Not secure' since the cert will be invalid.
911
version: "2.4"
1012
x-net: &net
1113
networks:

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "datajoint-labbook",
3-
"version": "0.1.0-alpha.1",
3+
"version": "0.1.0-alpha.2",
44
"description": "A frontend with graphical user interface for DataJoint pipelines built using React.",
55
"private": false,
66
"repository": {

0 commit comments

Comments
 (0)