Merge pull request #2 from kabilar/master

Update Docker Compose and DevContainer files

Author: ttngu207

.devcontainer/Dockerfile

@@ -1,11 +1,10 @@
-# Note: You can use any Debian/Ubuntu based image you want. 
 FROM mcr.microsoft.com/devcontainers/python:3.7-bullseye
 
 RUN \
     apt update && \
     apt-get install bash-completion graphviz default-mysql-client -y && \
     pip install flake8 black faker ipykernel
 
-ENV DJ_HOST localhost
+ENV DJ_HOST fakeservices.datajoint.io
 ENV DJ_USER root
 ENV DJ_PASS simple

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
 {
-	"name": "Development",
+	"name": "DataJoint Tutorial",
 	"dockerComposeFile": "docker-compose.yaml",
 	"service": "app",
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
@@ -16,13 +16,13 @@
 		"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 ./.devcontainer/local-docker-compose.yml down && MYSQL_VER=8.0 MINIO_VER=RELEASE.2022-08-11T04-37-28Z docker compose -f ./.devcontainer/local-docker-compose.yml up --build --wait",
+	"postStartCommand": "MYSQL_VER=8.0 docker compose down && MYSQL_VER=8.0 docker compose up --build --wait",
+	"hostRequirements": {
+		"cpus": 2,
+		"memory": "4gb"
+	},
 	"forwardPorts": [
-		80,
-		443,
-		3306,
-		8080,
-		9000
+		3306
 	],
 	"customizations": {
 		"vscode": {

.devcontainer/local-docker-compose.yml

@@ -0,0 +1,14 @@
+# MYSQL_VER=8.0 docker compose up --build
+version: "2.4"
+services:
+  db:
+    image: datajoint/mysql:${MYSQL_VER}
+    environment:
+      - MYSQL_ROOT_PASSWORD=${DJ_PASS}
+    ports:
+      - "3306:3306"
+    healthcheck:
+      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
+      timeout: 30s
+      retries: 5
+      interval: 15s

docker-compose.yml

@@ -18,7 +18,7 @@
     author='DataJoint',
     author_email='[email protected]',
     license='MIT',
-    url='https://github.com/datajoint-company/playground_tutorial',
+    url='https://github.com/datajoint/datajoint-tutorial',
     keywords='neuroscience datajoint',
     packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
     install_requires=requirements,