Merge pull request #116 from guzman-raphael/main

Restructure CI and add DevContainer build automation

.devcontainer/Dockerfile

@@ -13,6 +13,7 @@ RUN \
     usermod -aG docker vscode && \
     apt-get clean
 
+COPY ./requirements_dev.txt /tmp/
 RUN \
     # dev setup
     apt update && \
@@ -22,6 +23,8 @@ RUN \
     pip install --no-cache-dir --upgrade black pip && \
     echo '. /etc/bash_completion' >> /home/vscode/.bashrc && \
     echo 'export PS1="\[\e[32;1m\]\u\[\e[m\]@\[\e[34;1m\]\H\[\e[m\]:\[\e[33;1m\]\w\[\e[m\]$ "' >> /home/vscode/.bashrc && \
+    pip install --no-cache-dir -r /tmp/requirements_dev.txt && \
+    rm /tmp/requirements_dev.txt && \
     # dircolors -b >> /home/vscode/.bashrc && \  # somehow fix colors
     apt-get clean
 COPY ./requirements.txt /tmp/

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"name": "Tutorial environment",
+	"name": "Environment + Data",
 	"dockerComposeFile": "docker-compose.yaml",
 	"service": "app",
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
@@ -9,17 +9,17 @@
 	"onCreateCommand": "mkdir -p ${IMAGING_ROOT_DATA_DIR} && pip install -e . && MYSQL_VER=8.0 docker compose down && MYSQL_VER=8.0 docker compose up --build --wait",
 	"postStartCommand": "docker volume prune -f && s3fs ${DJ_PUBLIC_S3_LOCATION} ${IMAGING_ROOT_DATA_DIR} -o nonempty,multipart_size=530,endpoint=us-east-1,url=http://s3.amazonaws.com,public_bucket=1",
 	"hostRequirements": {
-		"cpus": 2,
+		"cpus": 4,
 		"memory": "16gb",
 		"storage": "32gb"
 	},
 	"forwardPorts": [
 		3306
 	],
-	"customizations": {	
+	"customizations": {
 		"settings": {
 			"python.pythonPath": "/usr/local/bin/python"
-	 	},
+		},
 		"vscode": {
 			"extensions": [
 				"ms-python.python",

.devcontainer/docker-compose.yaml

@@ -2,7 +2,7 @@ version: "3"
 services:
   app:
     extends:
-      file: ./local-data/docker-compose.yaml
+      file: ./local/docker-compose.yaml
       service: app
     environment:
       - DJ_PUBLIC_S3_LOCATION=djhub.vathes.datapub.elements:/workflow-calcium-imaging-data-v2

.devcontainer/local-data/devcontainer.json → .devcontainer/local/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"name": "Dev environment with local data",
+	"name": "Environment",
 	"dockerComposeFile": "docker-compose.yaml",
 	"service": "app",
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
@@ -9,17 +9,17 @@
 	"onCreateCommand": "pip install -e . && MYSQL_VER=8.0 docker compose down && MYSQL_VER=8.0 docker compose up --build --wait",
 	"postStartCommand": "docker volume prune -f",
 	"hostRequirements": {
-		"cpus": 2,
+		"cpus": 4,
 		"memory": "16gb",
 		"storage": "32gb"
 	},
 	"forwardPorts": [
 		3306
 	],
-	"customizations": {	
+	"customizations": {
 		"settings": {
 			"python.pythonPath": "/usr/local/bin/python"
-	 	},
+		},
 		"vscode": {
 			"extensions": [
 				"ms-python.python",

.devcontainer/local-data/docker-compose.yaml → .devcontainer/local/docker-compose.yaml

@@ -1,15 +1,16 @@
 version: "3"
 services:
   app:
-    cpus: 2
+    cpus: 4
     mem_limit: 16g
-    build:
-      context: ../..
-      dockerfile: ./.devcontainer/Dockerfile
+    # build:
+    #   context: ../..
+    #   dockerfile: ./.devcontainer/Dockerfile
+    image: datajoint/workflow_calcium_imaging_devcontainer:latest
     extra_hosts:
       - fakeservices.datajoint.io:127.0.0.1
     volumes:
-      - ../../..:/workspaces:cached
+      - ../..:/workspaces/workflow-calcium-imaging:cached
       - docker_data:/var/lib/docker  # persist docker images
     privileged: true # only because of dind
 volumes:

.github/workflows/release.yaml

@@ -0,0 +1,13 @@
+name: Release
+on:
+  workflow_dispatch:
+jobs:
+  devcontainer-build:
+    uses: datajoint/.github/.github/workflows/devcontainer-build.yaml@main
+  devcontainer-publish:
+    needs: 
+      - devcontainer-build
+    uses: datajoint/.github/.github/workflows/devcontainer-publish.yaml@main
+    secrets:
+      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
+      DOCKERHUB_TOKEN: ${{secrets.DOCKERHUB_TOKEN}}

.github/workflows/test.yaml

@@ -0,0 +1,7 @@
+name: Test
+on:
+  push:
+  pull_request:
+jobs:
+  devcontainer-build:
+    uses: datajoint/.github/.github/workflows/devcontainer-build.yaml@main