Skip to content

Commit

Permalink
update webos sdk to 1.11.0, fix vitalets#2
Browse files Browse the repository at this point in the history
  • Loading branch information
vitalets committed Jul 11, 2021
1 parent e5f0fc5 commit 29d95d0
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,5 @@ RUN unzip -q webos_cli_tv.zip -d ${WEBOS_SDK_PATH} \
&& chmod -R +x ${WEBOS_SDK_PATH}/CLI/bin \
&& rm webos_cli_tv.zip

# Replace lib/deviceInfo.js with patched version until it will be officially released
COPY vendor/deviceInfo-patched.js ${WEBOS_SDK_PATH}/CLI/lib/deviceInfo.js

# Add tizen/webos cli to PATH
ENV PATH $PATH:/tizen-studio/tools/:/tizen-studio/tools/ide/bin/:/tizen-studio/package-manager/:${WEBOS_SDK_PATH}/CLI/bin
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Available CLI commands:
- [Build container](#build-container)
- [Slow way](#slow-way)
- [Fast way](#fast-way)
- [Update webOS sdk](#update-webos-sdk)
- [Test](#test)
- [Generate TOC](#generate-toc)
- [Publish to Docker Hub](#publish-to-docker-hub)
Expand Down Expand Up @@ -323,10 +324,16 @@ docker build -t vitalets/tizen-webos-sdk .
TIZEN_STUDIO_VERSION=4.1.1
docker run -d --rm --name nginx-temp -p 8080:80 -v $(pwd)/vendor:/usr/share/nginx/html:ro nginx \
&& docker build -t vitalets/tizen-webos-sdk . \
--build-arg TIZEN_STUDIO_URL=http://host.docker.internal:8080/web-cli_Tizen_Studio_${TIZEN_STUDIO_VERSION}_ubuntu-64.bin \
--build-arg TIZEN_STUDIO_URL=http://172.17.0.1:8080/web-cli_Tizen_Studio_${TIZEN_STUDIO_VERSION}_ubuntu-64.bin \
; docker stop nginx-temp
```

### Update webOS sdk
1. Download [latest installer for linux](https://webostv.developer.lge.com/sdk/installation/download-installer/#)
2. Unzip `webOS_SDK_TV_Installer_linux64_min.zip`
3. Unzip again `webOS_SDK_TV_linux64.zip`
4. Copy `webos_cli_tv.zip` to `vendor` dir

### Test
```bash
./test.sh
Expand All @@ -341,7 +348,7 @@ docker run --rm -it -v $(pwd):/usr/src jorgeandrada/doctoc --github README.md
1. Check [existing tags](https://hub.docker.com/repository/docker/vitalets/tizen-webos-sdk/tags?page=1&ordering=last_updated) on docker hub.
2. Set new tag and push to registry:
```bash
TAG=1.0
TAG=x.x
docker tag vitalets/tizen-webos-sdk:latest vitalets/tizen-webos-sdk:$TAG
docker push vitalets/tizen-webos-sdk:$TAG
```
Expand Down
6 changes: 3 additions & 3 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ assert() {
fi
}

assert "$(cmd tizen version)" "Tizen CLI 2.5.21"
assert "$(cmd sdb version)" "Smart Development Bridge version 4.2.12"
assert "$(cmd ares-setup-device --version)" "Version: 1.10.4-j1703-k"
assert "$(cmd tizen version)" "Tizen CLI 2.5.25"
assert "$(cmd sdb version)" "Smart Development Bridge version 4.2.16"
assert "$(cmd ares-setup-device --version)" "Version: 1.11.0-j31-k"
1 change: 0 additions & 1 deletion vendor/deviceInfo-patched.js

This file was deleted.

Binary file modified vendor/webos_cli_tv.zip
Binary file not shown.

0 comments on commit 29d95d0

Please sign in to comment.