Skip to content

Commit

Permalink
Merge pull request #30 from cyberbotics/update-R2023b
Browse files Browse the repository at this point in the history
Update R2023b
  • Loading branch information
Benjamin Délèze committed Jun 26, 2023
2 parents 0cd9e3d + d928f35 commit c256296
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
env:
IMAGE_NAME: webots
CLOUD_IMAGE_NAME: webots.cloud
DEFAULT_WEBOTS_VERSION: R2023a
DEFAULT_WEBOTS_VERSION: R2023b

jobs:
dockerhub-publication:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG BASE_IMAGE=nvidia/cuda:11.8.0-base-ubuntu22.04
FROM ${BASE_IMAGE} AS downloader

# Determine Webots version to be used and set default argument
ARG WEBOTS_VERSION=R2023a
ARG WEBOTS_VERSION=R2023b
ARG WEBOTS_PACKAGE_PREFIX=

# Disable dpkg/gdebi interactive dialogs
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_ikpy
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM cyberbotics/webots.cloud:R2023a-ubuntu22.04
FROM cyberbotics/webots.cloud:R2023b-ubuntu22.04
RUN apt-get update && apt-get install -y python3-pip && rm -rf /var/lib/apt/lists/ && pip install --no-cache-dir ikpy
6 changes: 3 additions & 3 deletions Dockerfile_webots_cloud
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ ARG BASE_IMAGE=cyberbotics/webots:latest
FROM $BASE_IMAGE AS downloader

# Determine Webots version to be used and set default argument
ARG WEBOTS_VERSION=R2023a
ARG WEBOTS_VERSION=R2023b

RUN apt update && apt install --yes unzip && \
wget https://github.com/cyberbotics/webots/releases/download/$WEBOTS_VERSION/assets-$WEBOTS_VERSION.zip && \
mkdir assets && cp assets-$WEBOTS_VERSION.zip assets/ && \
cd assets && unzip assets-$WEBOTS_VERSION.zip && rm assets-$WEBOTS_VERSION.zip

FROM $BASE_IMAGE
ARG WEBOTS_VERSION=R2023a
ARG WEBOTS_VERSION=R2023b

COPY Webots-R2023a.conf /root/.config/Cyberbotics/Webots-$WEBOTS_VERSION.conf
COPY Webots-R2023b.conf /root/.config/Cyberbotics/Webots-$WEBOTS_VERSION.conf
COPY --from=downloader /usr/local/assets /root/.cache/Cyberbotics/Webots/assets/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ To use the already available image please follow the [Webots installation instru
Use the following command to build the docker container from the Dockerfile:

``` bash
docker build . --file Dockerfile --tag cyberbotics/webots:latest [--build-arg BASE_IMAGE=nvidia/cuda:11.8.0-base-ubuntu22.04] [--build-arg WEBOTS_VERSION=R2023a] [--build-arg WEBOTS_PACKAGE_PREFIX=_ubuntu-22.04]
docker build . --file Dockerfile --tag cyberbotics/webots:latest [--build-arg BASE_IMAGE=nvidia/cuda:11.8.0-base-ubuntu22.04] [--build-arg WEBOTS_VERSION=R2023b] [--build-arg WEBOTS_PACKAGE_PREFIX=_ubuntu-22.04]
```

## Build the Webots.Cloud Images

Use the following command to build the docker container from the Dockerfile_webots_cloud:

``` bash
docker build . --file Dockerfile_webots_cloud --tag cyberbotics/webots.cloud:latest [--build-arg BASE_IMAGE=cyberbotics/webots:latest] [--build-arg WEBOTS_VERSION=R2023a]
docker build . --file Dockerfile_webots_cloud --tag cyberbotics/webots.cloud:latest [--build-arg BASE_IMAGE=cyberbotics/webots:latest] [--build-arg WEBOTS_VERSION=R2023b]
```

## Run a Docker container from the Image
Expand Down
5 changes: 1 addition & 4 deletions Webots-R2023a.conf → Webots-R2023b.conf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ httpProxyPassword=
httpProxyPort=0
httpProxyType=2
httpProxyUsername=
uploadUrl=https://beta.webots.cloud
uploadUrl=https://webots.cloud

[OpenGL]
GTAO=0
Expand All @@ -53,9 +53,6 @@ newBrowserWindow=false
mute=true
volume=80

[Streaming]
port=1234

[View3d]
hideAllCameraOverlays=false
hideAllDisplayOverlays=false
Expand Down

0 comments on commit c256296

Please sign in to comment.