Skip to content

Commit 67c6530

Browse files
Merge pull request #164 from jverswijver/fix_dockerfile
fix dockerfile.
2 parents db751f2 + 830951d commit 67c6530

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "pharus"]
22
path = pharus
3-
url = git@github.com:datajoint/pharus.git
3+
url = https://github.com/datajoint/pharus.git
44
branch = master

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
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.
4+
## [Unreleased]
5+
### Fixed
6+
- fixed bug with the labbook dockerfile PR #164
7+
- updated pharus version to 0.2.2 PR #164
48

59
## [0.1.0] - 2021-03-31
610
### Added
@@ -104,6 +108,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
104108
- Multi database server connections supported by opening new tabs.
105109
- Support of DJ NEURO - [Managed Database Hosting](https://djneuro.io/services/) users.
106110

111+
[Unreleased]: https://github.com/datajoint/datajoint-labbook/compare/0.1.0...HEAD
107112
[0.1.0]: https://github.com/datajoint/datajoint-labbook/compare/0.1.0-beta.2...0.1.0
108113
[0.1.0-beta.2]: https://github.com/datajoint/datajoint-labbook/compare/0.1.0-beta.1...0.1.0-beta.2
109114
[0.1.0-beta.1]: https://github.com/datajoint/datajoint-labbook/compare/0.1.0-alpha.2...0.1.0-beta.1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Temp image to create exec to allow UID/GID to be updated on boot
22
FROM golang:alpine3.11 as go_tmp
3-
ADD https://raw.githubusercontent.com/datajoint/djbase-docker/master/utilities/startup.go /startup.go
3+
ADD https://raw.githubusercontent.com/datajoint/miniconda3-docker/master/utilities/startup.go /startup.go
44
RUN cd / && go build startup.go
55
# Main dev image
66
FROM node:lts-buster-slim

0 commit comments

Comments
 (0)