Skip to content

Commit

Permalink
General maintenance (#32) (#33)
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
kamildzi authored Mar 31, 2024
1 parent 83942d5 commit ed70a12
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand All @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion checkDeps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 4 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ version: '3'
services:
tizen:
privileged: true
ulimits:
nofile:
soft: 65536
hard: 65536
build:
context: tizen-ide
args:
Expand Down
2 changes: 1 addition & 1 deletion runTizen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ed70a12

Please sign in to comment.