From fb9d1894ccea717cc5504da698138d2c41b7a7ce Mon Sep 17 00:00:00 2001
From: Aisuko <urakiny@gmail.com>
Date: Sun, 14 Jul 2024 15:56:37 +1000
Subject: [PATCH] Fix devcontainer and bump version

Signed-off-by: Aisuko <urakiny@gmail.com>
---
 .devcontainer/devcontainer.json | 13 ++++++-------
 Makefile                        |  2 +-
 backend/Dockerfile              |  8 ++++----
 docker-compose.yaml             |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0000daf..713f447 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -19,12 +19,8 @@
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 	"features": {
 		"ghcr.io/jungaretti/features/make:1": {},
-		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
-			"moby": true,
-			"installDockerBuildx": true,
-			"version": "latest",
-			"dockerDashComposeVersion": "v2"
-		}
+		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
+		"ghcr.io/devcontainers-contrib/features/poetry:2": {}
 	},
 	"customizations": {
 		"vscode": {
@@ -48,12 +44,15 @@
 	// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
 	// "shutdownAction": "none",
 
+	"initializeCommand": "make prepare",
+
 	// Uncomment the next line to run commands after the container is created.
-	"postCreateCommand": "make prepare"
+	"postCreateCommand": "make install"
 
 	// Configure tool-specific properties.
 	// "customizations": {},
 
+
 	// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
 	// "remoteUser": "devcontainer"
 }
diff --git a/Makefile b/Makefile
index a59587d..129c7b7 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ DEBUG:=True
 BACKEND_SERVER_HOST:=127.0.0.1
 BACKEND_SERVER_PORT:=8000
 BACKEND_SERVER_WORKERS:=4
-BACKEND_SERVER_VERSION:=v0.1.13
+BACKEND_SERVER_VERSION:=v0.1.15
 TIMEZONE:="UTC"
 
 # Database - Postgres
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 41f039b..8101687 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -7,11 +7,11 @@ WORKDIR /app
 
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
-ENV VIRTUAL_ENV=/opt/venv
+# ENV VIRTUAL_ENV=/opt/venv
 
 # Switch on virtual environment
-RUN python3 -m venv $VIRTUAL_ENV
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+# RUN python3 -m venv $VIRTUAL_ENV
+# ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
 # Install system dependencies
 # netcat for nc command
@@ -22,7 +22,7 @@ RUN apt-get update \
 
 COPY . .
 
-RUN pip3 --disable-pip-version-check --no-cache-dir install -r requirements.txt && rm -rf /tmp/pip-tmp
+RUN pip --disable-pip-version-check --no-cache-dir install -r requirements.txt && rm -rf /tmp/pip-tmp
 
 EXPOSE 8000
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1fd0563..a80e230 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -161,7 +161,7 @@ services:
 
   rebel:
     container_name: rebel
-    image: ghcr.io/skywardai/rebel:v0.1.5
+    image: ghcr.io/skywardai/rebel:v0.1.6
     restart: always
     expose:
       - 80