From ed70a1290008ffb272e6ad0a6baeed67fc01388e Mon Sep 17 00:00:00 2001
From: Kamil D <kamildzi@users.noreply.github.com>
Date: Sun, 31 Mar 2024 22:20:12 +0200
Subject: [PATCH] General maintenance (#32) (#33)

- Dropped `docker-compose` support in favor of `docker compose` (native plugin)
- Dependency checks updated
- `ulimits` setting introduced (required for the latest docker releases)
- Adjusted for latest docker releases (tested on v.25)
- Readme-Docs updated
- Tizen version updated
---
 .env.example                      | 2 +-
 .github/workflows/dockerimage.yml | 2 +-
 README.md                         | 8 ++++----
 checkDeps.sh                      | 2 +-
 docker-compose.yml                | 4 ++++
 runTizen.sh                       | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.env.example b/.env.example
index 79d2c7f..e792302 100644
--- a/.env.example
+++ b/.env.example
@@ -44,7 +44,7 @@ TIZEN_TARGET=WEARABLE-4.0
 
 # -- VERSION CONFIG --
 # select Tizen Studio version
-TIZEN_VERSION=4.5.1
+TIZEN_VERSION=5.5
 
 # -- XSERVER SETTINGS --
 # defaults should be fine in most cases
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index cf0eba9..bc23300 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -15,4 +15,4 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Build the Docker image
-      run: docker-compose --file docker-compose.yml --env-file .env.example build
+      run: docker compose --file docker-compose.yml --env-file .env.example build
diff --git a/README.md b/README.md
index 81c7e99..befc02a 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ NOTE:
 - the image has built-in google-chrome browser (required by the IDE)
 
 # Requirements
-Docker and Docker-Compose are the base requirements. \
-Make sure to have them installed on your system. \
+Docker is the base requirement. \
+Make sure to have it installed on your system. \
 \
 Detailed dependency check can be done with `./checkDeps.sh` script.
 ```bash
@@ -24,7 +24,7 @@ Detailed dependency check can be done with `./checkDeps.sh` script.
 2. Edit and save new settings as `.env` file. 
 
 ## Advanced configuration (optional, most users should be fine with defaults)
-1. You might want to change authentication method for docker-compose command. This can be done at `runTizen.sh` file (please check `# Docker-Auth config` header). 
+1. You might want to change authentication method for the `docker` command. This can be done at `runTizen.sh` file (please check `# Docker-Auth config` header). 
 2. Advanced configuration can be found at `docker-compose.yml`.
 3. Advanced users might be interested in debug mode `./runTizen.sh d` (which allows easy access to docker container)
 
@@ -37,7 +37,7 @@ This will automatically build docker-image if it is needed. \
 \
 Alternatively you might start build command manually:
 ```bash
-sudo docker-compose build
+sudo docker compose build
 ```
 
 # How to run the IDE?
diff --git a/checkDeps.sh b/checkDeps.sh
index 77408ea..168308f 100755
--- a/checkDeps.sh
+++ b/checkDeps.sh
@@ -2,7 +2,7 @@
 # @K.Dziuba
 # Tizen4Docker dependencies check
 
-REQUIREMENTS="docker docker-compose xhost bash"
+REQUIREMENTS="docker xhost bash"
 
 # Define colors (ANSI)
 C_RED='\033[0;31m'
diff --git a/docker-compose.yml b/docker-compose.yml
index e574a39..dcce5fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,10 @@ version: '3'
 services:
   tizen:
     privileged: true
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 65536
     build: 
       context: tizen-ide
       args:
diff --git a/runTizen.sh b/runTizen.sh
index 7bd94be..9ebf5d1 100755
--- a/runTizen.sh
+++ b/runTizen.sh
@@ -205,7 +205,7 @@ main() {
 
     if [[ $CMD != "false" ]]; then
         # default - run the container
-        $authPrefix docker-compose \
+        $authPrefix docker compose \
             --file "$COMPOSE_FILE" \
             --env-file "$ENV_FILE" \
             run --rm tizen "$CMD"