Clean up.

Author: guzman-raphael

.devcontainer/Dockerfile

@@ -1,10 +1,6 @@
 # Note: You can use any Debian/Ubuntu based image you want. 
 FROM mcr.microsoft.com/devcontainers/base:bullseye
 
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
-
 RUN \
     apt update && \
     apt-get install bash-completion graphviz -y

.devcontainer/devcontainer.json

@@ -16,7 +16,7 @@
 		"ghcr.io/guiyomh/features/vim:0": {},
 		"ghcr.io/devcontainers/features/python:1": {
 			"version": "3.7"
-		},
+		}
 	},
 	"postCreateCommand": "pip install flake8 black faker ipykernel nose nose-cov && pip install -e . && MYSQL_VER=5.7 MINIO_VER=RELEASE.2022-08-11T04-37-28Z docker compose -f local-docker-compose.yml up --build -d",
 	"customizations": {
@@ -26,10 +26,4 @@
 			]
 		}
 	}
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [80]
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "docker --version",
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
 }

.devcontainer/docker-compose.yaml

@@ -1,23 +1,8 @@
 version: "3"
-
 services:
   app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-
+    build: .
     volumes:
-      # Update this to wherever you want VS Code to mount the folder of your project
       - ../..:/workspaces:cached
-
-    # Overrides default command so things don't shut down after the process ends.
     entrypoint: /usr/local/share/docker-init.sh
     command: tail -f /dev/null
-    # Uncomment the next four lines if you will use a ptrace-based debuggers like C++, Go, and Rust.
-    # cap_add:
-    #  - SYS_PTRACE
-    # security_opt:
-    #   - seccomp:unconfined
-
-    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
-    # (Adding the "ports" property to this file will not forward from a Codespace.)

.github/workflows/development.yaml

@@ -2,23 +2,23 @@ name: Development
 on:
   push:
     branches:
-      - '**' # every branch
-      - '!gh-pages' # exclude gh-pages branch
-      - '!stage*' # exclude branches beginning with stage
+      - "**" # every branch
+      - "!gh-pages" # exclude gh-pages branch
+      - "!stage*" # exclude branches beginning with stage
     tags:
       - '\d+\.\d+\.\d+' # only semver tags
   pull_request:
     branches:
-      - '**' # every branch
-      - '!gh-pages' # exclude gh-pages branch
-      - '!stage*' # exclude branches beginning with stage
+      - "**" # every branch
+      - "!gh-pages" # exclude gh-pages branch
+      - "!stage*" # exclude branches beginning with stage
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
-          - py_ver: '3.9'
+          - py_ver: "3.9"
             distro: debian
             image: djbase
     env:
@@ -77,6 +77,7 @@ jobs:
       - name: Run primary tests
         env:
           PY_VER: ${{matrix.py_ver}}
+          DJ_PASS: simple
           MYSQL_VER: ${{matrix.mysql_ver}}
           DISTRO: alpine
           MINIO_VER: RELEASE.2021-09-03T03-56-13Z
@@ -119,7 +120,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - py_ver: '3.9'
+          - py_ver: "3.9"
             distro: debian
             image: djbase
     env:

LNX-docker-compose.yml

@@ -1,14 +1,14 @@
 # PY_VER=3.8 MYSQL_VER=5.7 DISTRO=alpine MINIO_VER=RELEASE.2022-08-11T04-37-28Z HOST_UID=$(id -u) docker compose -f LNX-docker-compose.yml up --exit-code-from app --build
-version: '2.4'
+version: "2.4"
 x-net: &net
   networks:
-      - main
+    - main
 services:
   db:
     <<: *net
     image: datajoint/mysql:${MYSQL_VER}
     environment:
-      - MYSQL_ROOT_PASSWORD=simple
+      - MYSQL_ROOT_PASSWORD=${DJ_PASS}
     # ports:
     #   - "3306:3306"
     # volumes:
@@ -34,12 +34,12 @@ services:
     <<: *net
     image: datajoint/nginx:v0.2.4
     environment:
-    - ADD_db_TYPE=DATABASE
-    - ADD_db_ENDPOINT=db:3306
-    - ADD_minio_TYPE=MINIO
-    - ADD_minio_ENDPOINT=minio:9000
-    - ADD_minio_PORT=80 # allow unencrypted connections
-    - ADD_minio_PREFIX=/datajoint
+      - ADD_db_TYPE=DATABASE
+      - ADD_db_ENDPOINT=db:3306
+      - ADD_minio_TYPE=MINIO
+      - ADD_minio_ENDPOINT=minio:9000
+      - ADD_minio_PORT=80 # allow unencrypted connections
+      - ADD_minio_PREFIX=/datajoint
     # ports:
     #   - "80:80"
     #   - "443:443"
@@ -58,7 +58,7 @@ services:
     environment:
       - DJ_HOST=fakeservices.datajoint.io
       - DJ_USER=root
-      - DJ_PASS=simple
+      - DJ_PASS
       - DJ_TEST_HOST=fakeservices.datajoint.io
       - DJ_TEST_USER=datajoint
       - DJ_TEST_PASSWORD=datajoint

local-docker-compose.yml

@@ -1,15 +1,14 @@
 # MYSQL_VER=5.7 MINIO_VER=RELEASE.2022-08-11T04-37-28Z docker compose -f local-docker-compose.yml up --build
-version: '2.4'
-x-net:
-  &net
+version: "2.4"
+x-net: &net
   networks:
     - main
 services:
   db:
     <<: *net
     image: datajoint/mysql:${MYSQL_VER}
     environment:
-      - MYSQL_ROOT_PASSWORD=simple
+      - MYSQL_ROOT_PASSWORD=${DJ_PASS}
     # ports:
     #   - "3306:3306"
     # To persist MySQL data
@@ -29,13 +28,7 @@ services:
     #   - ./minio/config:/root/.minio
     command: server --address ":9000" /data
     healthcheck:
-      test:
-        [
-          "CMD",
-          "curl",
-          "--fail",
-          "http://minio:9000/minio/health/live"
-        ]
+      test: ["CMD", "curl", "--fail", "http://minio:9000/minio/health/live"]
       timeout: 5s
       retries: 60
       interval: 1s