-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into hidden-1091-continued
- Loading branch information
Showing
94 changed files
with
15,137 additions
and
253 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| # Note: You can use any Debian/Ubuntu based image you want. | ||
| FROM mcr.microsoft.com/devcontainers/python:3.7-bullseye | ||
|
|
||
| ARG PY_VER | ||
| ARG DISTRO | ||
| FROM mcr.microsoft.com/devcontainers/python:${PY_VER}-${DISTRO} | ||
| RUN \ | ||
| apt update && \ | ||
| apt-get install bash-completion graphviz default-mysql-client -y && \ | ||
| pip install flake8 black faker ipykernel pytest pytest-cov nose nose-cov datajoint && \ | ||
| pip install flake8 black faker ipykernel pytest pytest-cov nose nose-cov datajoint jupyterlab && \ | ||
| pip uninstall datajoint -y | ||
|
|
||
| USER root | ||
| ENV DJ_HOST fakeservices.datajoint.io | ||
| ENV DJ_USER root | ||
| ENV DJ_PASS simple | ||
| ENV DJ_PASS password |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,50 @@ | ||
| // For format details, see https://aka.ms/devcontainer.json. For config options, see the | ||
| // README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose | ||
| { | ||
| "name": "Development", | ||
| "dockerComposeFile": "docker-compose.yaml", | ||
| "name": "Existing Docker Compose (Extend)", | ||
| // Update the 'dockerComposeFile' list if you have more compose files or use different names. | ||
| // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make. | ||
| "dockerComposeFile": [ | ||
| "../LNX-docker-compose.yml", | ||
| "docker-compose.yml" | ||
| ], | ||
| // The 'service' property is the name of the service for the container that VS Code should | ||
| // use. Update this value and .devcontainer/docker-compose.yml to the real service name. | ||
| "service": "app", | ||
| // The optional 'workspaceFolder' property is the path VS Code should open by default when | ||
| // connected. This is typically a file mount in .devcontainer/docker-compose.yml | ||
| "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", | ||
| // Use this environment variable if you need to bind mount your local source code into a new container. | ||
| "remoteEnv": { | ||
| "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" | ||
| }, | ||
| // https://containers.dev/features | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/docker-in-docker:2": {}, | ||
| "ghcr.io/devcontainers/features/git:1": {}, | ||
| "ghcr.io/eitsupi/devcontainer-features/jq-likes:1": {}, | ||
| "ghcr.io/guiyomh/features/vim:0": {} | ||
| }, | ||
| "onCreateCommand": "pip install -e .", | ||
| "postStartCommand": "MYSQL_VER=8.0 MINIO_VER=RELEASE.2022-08-11T04-37-28Z docker compose -f local-docker-compose.yml down && docker volume prune -f && MYSQL_VER=8.0 MINIO_VER=RELEASE.2022-08-11T04-37-28Z docker compose -f local-docker-compose.yml up --build --wait", | ||
| // Features to add to the dev container. More info: https://containers.dev/features. | ||
| // "features": {}, | ||
| // Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
| "forwardPorts": [ | ||
| 80, | ||
| 443, | ||
| 3306, | ||
| 8080, | ||
| 9000 | ||
| ], | ||
| // Uncomment the next line if you want start specific services in your Docker Compose config. | ||
| // "runServices": [], | ||
| // Uncomment the next line if you want to keep your containers running after VS Code shuts down. | ||
| "shutdownAction": "stopCompose", | ||
| "onCreateCommand": "python3 -m pip install -e .", | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/git:1": {}, | ||
| "ghcr.io/devcontainers/features/docker-in-docker:2": {}, | ||
| "ghcr.io/devcontainers/features/github-cli:1": {}, | ||
| }, | ||
| // Configure tool-specific properties. | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": [ | ||
| "ms-python.python" | ||
| ] | ||
| } | ||
| }, | ||
| "remoteEnv": { | ||
| "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" | ||
| } | ||
| // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. | ||
| // "remoteUser": "devcontainer" | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| version: '2.4' | ||
| services: | ||
| # Update this to the name of the service you want to work with in your docker-compose.yml file | ||
| app: | ||
| # Uncomment if you want to override the service's Dockerfile to one in the .devcontainer | ||
| # folder. Note that the path of the Dockerfile and context is relative to the *primary* | ||
| # docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile" | ||
| # array). The sample below assumes your primary file is in the root of your project. | ||
| container_name: datajoint-python-devcontainer | ||
| image: datajoint/datajoint-python-devcontainer:${PY_VER:-3.11}-${DISTRO:-buster} | ||
| build: | ||
| context: . | ||
| dockerfile: .devcontainer/Dockerfile | ||
| args: | ||
| - PY_VER=${PY_VER:-3.11} | ||
| - DISTRO=${DISTRO:-buster} | ||
|
|
||
| volumes: | ||
| # Update this to wherever you want VS Code to mount the folder of your project | ||
| - ..:/workspaces:cached | ||
|
|
||
| # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust. | ||
| # cap_add: | ||
| # - SYS_PTRACE | ||
| # security_opt: | ||
| # - seccomp:unconfined | ||
|
|
||
| user: root | ||
|
|
||
| # Overrides default command so things don't shut down after the process ends. | ||
| command: /bin/sh -c "while sleep 1000; do :; done" | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.