From b1d736918894bdb9e3b4dabaaf5547cdc9631d8b Mon Sep 17 00:00:00 2001
From: Laurent Fainsin <laurentfainsin@protonmail.com>
Date: Wed, 7 Sep 2022 10:45:01 +0200
Subject: [PATCH] chore[WIP]: renamed .devcontainer

Former-commit-id: 9be6ae28812816464eddce68a0062f999e10acdb [formerly 966d86bf049bf9b798fa4c39b59f0d0f54a290b3]
Former-commit-id: 85c6a59cf9126b2da4394de780271a56b3dd242b
---
 .devcontainer.tmp/.env                        |  3 ---
 .devcontainer.tmp/Dockerfile                  | 12 ----------
 .devcontainer.tmp/docker-compose.yml          | 24 -------------------
 .devcontainer/Dockerfile                      | 12 ++++++++++
 .../devcontainer.json                         |  2 +-
 .devcontainer/docker-compose.yml              | 24 +++++++++++++++++++
 6 files changed, 37 insertions(+), 40 deletions(-)
 delete mode 100644 .devcontainer.tmp/.env
 delete mode 100644 .devcontainer.tmp/Dockerfile
 delete mode 100644 .devcontainer.tmp/docker-compose.yml
 create mode 100644 .devcontainer/Dockerfile
 rename {.devcontainer.tmp => .devcontainer}/devcontainer.json (80%)
 create mode 100644 .devcontainer/docker-compose.yml

diff --git a/.devcontainer.tmp/.env b/.devcontainer.tmp/.env
deleted file mode 100644
index 0e78e4e..0000000
--- a/.devcontainer.tmp/.env
+++ /dev/null
@@ -1,3 +0,0 @@
-WANDB_VOLUME_PATH=/media/disk2/lfainsin/wandb-local/
-WANDB_BASE_URL=http://wandb:8080
-WANDB_API_KEY=XXXX
diff --git a/.devcontainer.tmp/Dockerfile b/.devcontainer.tmp/Dockerfile
deleted file mode 100644
index a417531..0000000
--- a/.devcontainer.tmp/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM python:3
-
-WORKDIR /workspace
-
-RUN pip install --upgrade pip --no-input
-RUN curl -sSL https://install.python-poetry.org | python3 -
-
-RUN echo 'export PATH="$PATH:/root/.local/bin"' >> /root/.bashrc
-RUN echo '/root/.local/bin/poetry install --no-interaction' >> /root/.bashrc
-RUN echo '/root/.local/bin/poetry shell' >> /root/.bashrc
-
-SHELL ["/bin/bash", "-ec"]
diff --git a/.devcontainer.tmp/docker-compose.yml b/.devcontainer.tmp/docker-compose.yml
deleted file mode 100644
index ad7fd2a..0000000
--- a/.devcontainer.tmp/docker-compose.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: "3"
-
-services:
-
-  # development container
-  development:
-    container_name: dev
-    hostname: dev
-    build:
-      context: .
-      dockerfile: Dockerfile
-    volumes:
-      - ..:/workspace
-    stdin_open: true
-
-  # wandb dashboard
-  wandb:
-    image: wandb/local
-    container_name: wandb-local
-    hostname: wandb-local
-    volumes:
-      - ./wandb-local/:/vol
-    ports:
-      - 8080:8080
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..0ebf419
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,12 @@
+FROM python:3
+
+# WORKDIR /workspace
+
+# RUN pip install --upgrade pip --no-input
+# RUN curl -sSL https://install.python-poetry.org | python3 -
+
+# RUN echo 'export PATH="$PATH:/root/.local/bin"' >> /root/.bashrc
+# RUN echo '/root/.local/bin/poetry install --no-interaction' >> /root/.bashrc
+# RUN echo '/root/.local/bin/poetry shell' >> /root/.bashrc
+
+# SHELL ["/bin/bash", "-ec"]
diff --git a/.devcontainer.tmp/devcontainer.json b/.devcontainer/devcontainer.json
similarity index 80%
rename from .devcontainer.tmp/devcontainer.json
rename to .devcontainer/devcontainer.json
index 33cc2de..ea2854f 100644
--- a/.devcontainer.tmp/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "devcontainer-example",
   "dockerComposeFile": "docker-compose.yml",
-  "service": "development",
+  "service": "dev",
   "workspaceFolder": "/workspace"
 }
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
new file mode 100644
index 0000000..82a2855
--- /dev/null
+++ b/.devcontainer/docker-compose.yml
@@ -0,0 +1,24 @@
+version: "3"
+
+services:
+
+  # development container
+  dev:
+    container_name: dev
+    hostname: dev
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ..:/workspace
+    stdin_open: true
+  
+  # # wandb dashboard
+  # wandb:
+  #   image: wandb/local
+  #   container_name: wandb-local
+  #   hostname: wandb-local
+  #   volumes:
+  #     - ./wandb-local/:/vol
+  #   ports:
+  #     - 8080:8080