mirror
/
repo2docker
kopia lustrzana https://github.com/jupyterhub/repo2docker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
1 629 Commity
5 Gałęzie
20 Tagi
4,7 MiB
Wykres commitów

725 Commity (28941f79000269ccb1346f91871f4f5d2ba179d6)

Autor SHA1 Wiadomość Data
Min RK 4f428c3055
Merge pull request #681 from Xarthisius/abspath_in_scripts 
[MRG] Allow absolute paths in build_script_files. Fixes #673
 2019-09-07 12:33:14 +02:00
Tim Head 37774fc288
Merge pull request #727 from minrk/full-progress 
include full docker progress events in push progress events
 2019-09-07 11:45:32 +02:00
GeorgianaElena 795769ee28 Removed debug print 2019-08-29 15:51:12 +03:00
GeorgianaElena 95fd0e5b81 Don't change file encoding 2019-08-29 15:13:33 +03:00
GeorgianaElena 3752fa1868 Added function to handle different file encodings 2019-08-28 16:25:12 +03:00
GeorgianaElena 5983ded5bb Upgrade IRKernel version to 1.0.2 2019-08-26 17:53:53 +03:00
pughdr 6de9bd4c69 Fixed merge conflict 2019-08-26 12:50:24 +03:00
David Anthoff 445bcb981c Add support for Julia 1.2.0 2019-08-25 21:46:23 -07:00
Scott Henderson 5ea4c29b83 bump conda minor version to 4.7.10 and refreeze 2019-07-29 17:30:50 +00:00
Scott Henderson 62e10d6891 switched pip packages to conda-forge 2019-07-29 17:23:09 +00:00
Tim Head 01c785f6fc Call parent preassemble scripts methods 
Without this we don't collect the files that other build packs need to
copy them over to the container in the pre-assemble stage.
 2019-07-23 07:33:06 +02:00
Tim Head 6c5c09b62b
Merge pull request #743 from minrk/conda-env-first-again-again 
[MRG] preassembly for conda/python
 2019-07-19 10:36:15 +02:00
Min RK 930e907ac6
Update repo2docker/buildpacks/conda/__init__.py 
Co-Authored-By: Tim Head <betatim@gmail.com>
 2019-07-19 08:56:06 +02:00
Tim Head 74af2ad83c
Merge pull request #748 from minrk/pipfile-toml 
parse pipfiles to determine Python version
 2019-07-18 21:48:35 +02:00
Min RK 31da8e32b1 run chown as root 2019-07-18 17:55:38 +02:00
Min RK 8236dc8ae1 only install pipenv in preassemble 
save preassembly of pipenv for a later patch
 2019-07-18 16:25:04 +02:00
Min RK 79c2617873 parse pipfiles to determine Python version 
these are structured files, no need to use regular expressions to parse them
 2019-07-18 16:13:41 +02:00
Min RK dd6cd93585 typo in doi regexp 
must use `r` prefix when there are escapes
 2019-07-18 14:41:01 +02:00
Min RK 654be046ac set permissions on repo_dir prior to preassemble 2019-07-18 14:40:08 +02:00
Min RK 3da5543bfc check for local pip requirements in conda environments 2019-07-18 14:39:35 +02:00
Min RK 4f3f192d2f preassembly for pipfiles 2019-07-16 15:52:39 +02:00
Min RK d6e66c886d preassemble python 2019-07-16 15:52:39 +02:00
Min RK ddfd3f3464 refreeze 2019-07-16 2019-07-16 15:23:00 +02:00
Min RK 70878082f6 conda install occurs in preassemble 2019-07-16 09:02:35 +02:00
Min RK 5b12e072b1 move stencila to preassemble 2019-07-16 08:35:35 +02:00
Min RK b6ab2a9986 check requirements.txt for local references 
allows assemble_from_subset when requirements.txt doesn't contain any local references
 2019-07-16 07:56:11 +02:00
Min RK 5cf4f786e8 add assemble_subset 
- get_assemble_files() returns list of files needed for assembly
- if buildpack.assemble_with_subset is set, only load assemble_files
  prior to running assembly scripts. Load the rest of the repo afterward

conda opts in to this, but currently I think this works
for everything *except* requirements.txt
 2019-07-16 07:55:52 +02:00
Min RK 5ef42fc2af
Merge pull request #718 from betatim/early-r 
[MRG] Install R packages before copying repo contents
 2019-07-16 07:30:16 +02:00
David R. Pugh 399b339a4a [WIP] Version bump Conda from 4.6.14 to 4.7.5 (#719) 
Version bump conda to 4.7.5

Co-authored-by: pughdr <david.pugh@kaust.edu.sa>
 2019-07-12 18:50:11 +02:00
Tim Head 09b84811ae Make sure all loops over dict items are deterministic 2019-07-12 07:23:41 +02:00
Min RK 6385097d20 comment about multiple json events per chunk 2019-07-09 16:17:56 +02:00
Tim Head 66227f85b4 Detect failure of pre-assembly in R buildpack 
If the pre-assembly step succeeds we do not re-run it after copying the
repository contents.
 2019-07-06 16:21:29 +02:00
Tim Head dd8ba8ec18 Remove print statement and unused import 2019-07-03 06:53:59 +02:00
Min RK 19e0255bb7 include full docker progress data in push events 
Most useful is probably progressDetail.progress which is the docker rendered

Example event:

```json
  "layers": {
    "25b373f5f7f1": {
      "status": "Waiting",
      "progressDetail": {},
      "id": "25b373f5f7f1"
    },
    "e9f2b5eca21e": {
      "status": "Pushing",
      "progressDetail": {
        "current": 747589632,
        "total": 758965327
      },
      "progress": "[=================================================> ]  747.6MB/759MB",
      "id": "e9f2b5eca21e"
    },
    "7753d7e0913b": {
      "status": "Pushed",
      "progressDetail": {},
      "id": "7753d7e0913b"
    },
    "ed03b06eb165": {
      "status": "Pushed",
      "progressDetail": {},
      "id": "ed03b06eb165"
    },
    "01cb88e6c1af": {
      "status": "Pushed",
      "progressDetail": {},
      "id": "01cb88e6c1af"
    },
    "adda4de99b3d": {
      "status": "Mounted from library/buildpack-deps",
      "progressDetail": {},
      "id": "adda4de99b3d"
    },
    "3a034154b7b6": {
      "status": "Mounted from library/buildpack-deps",
      "progressDetail": {},
      "id": "3a034154b7b6"
    }
```
 2019-07-02 15:05:08 +02:00
Tim Head 0eae8dc0c4 Install R packages before copying repo contents 2019-06-28 22:09:32 +02:00
Kacper Kowalik (Xarthisius) f80fb4b39b
Handle root user case more gracefully. Fixes #696 
If user_id is root, exit only from cmdline. Raise exception if r2d was
invoked as a library.
 2019-06-28 11:46:01 -05:00
Kacper Kowalik (Xarthisius) 24234d9365
Allow absolute paths in build_script_files. Fixes #673 2019-06-28 08:44:11 -05:00
Fabien Maussion 85b0d80b16
Update target_repo_dir docstring 
See https://discourse.jupyter.org/t/users-home-in-jupyterhub/1463/3
 2019-06-27 08:58:29 +01:00
Tim Head 6e93cb06a4
Merge pull request #649 from consideRatio/pipenv-support 
[MRG/REVIEW] Support Pipfile / Pipfile.lock with pipenv
 2019-06-26 07:26:35 +02:00
Erik Sundell ec7f20e1a8 Add inline comment about '\' 2019-06-25 21:21:46 +02:00
Erik Sundell 397cb939bc Correct path typo and add note about '//' 2019-06-25 19:02:17 +02:00
Erik Sundell 7dbee81af6 Syntax typo fix 2019-06-25 17:18:10 +02:00
Erik Sundell 6d508ac5e2 Autoformatting 2019-06-25 16:57:11 +02:00
Erik Sundell b4249db4ad Pin pipenv utilized to version: 2018.11.26 2019-06-25 16:39:48 +02:00
Erik Sundell 09558802d1 Formatting opinion 
The '//' will render to '/' in the Dockerfile that allows the RUN
command to continue on a new line. I initially added a '//' within a
python string on a blank line in order to format things within the
Python file to look potentially nicer, but this is of little importance
and I have now removed it again.
 2019-06-25 16:34:15 +02:00
Erik Sundell 8eae91bc67 Install pipenv in the kernel environ 2019-06-25 16:32:47 +02:00
Erik Sundell e5d2d4dd85 Make the python environment explicit during pip install 2019-06-25 16:30:02 +02:00
Tim Head 41da67490f Move more R config to the build phase 2019-06-25 13:17:56 +02:00
Tim Head 10ca25d986 Install APT packages before copying the repo contents 2019-06-25 12:57:54 +02:00
Tim Head 391f5bf4af
Revert "[MRG] Remove more files during the image build to slimdown the image" 2019-06-24 15:01:44 +02:00