From d928f35e4219277c465254a0008ec09f5699e3fd Mon Sep 17 00:00:00 2001
From: Benjamin Deleze <benjamin.deleze@cyberbotics.com>
Date: Mon, 26 Jun 2023 10:34:31 +0200
Subject: [PATCH] Update R2023b

---
 .github/workflows/docker-image.yml       | 2 +-
 Dockerfile                               | 2 +-
 Dockerfile_ikpy                          | 2 +-
 Dockerfile_webots_cloud                  | 6 +++---
 README.md                                | 4 ++--
 Webots-R2023a.conf => Webots-R2023b.conf | 5 +----
 6 files changed, 9 insertions(+), 12 deletions(-)
 rename Webots-R2023a.conf => Webots-R2023b.conf (94%)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 1d3a518..f22ce70 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -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:
diff --git a/Dockerfile b/Dockerfile
index 4a13ede..d6ef927 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
diff --git a/Dockerfile_ikpy b/Dockerfile_ikpy
index e444f7f..c61b783 100644
--- a/Dockerfile_ikpy
+++ b/Dockerfile_ikpy
@@ -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
diff --git a/Dockerfile_webots_cloud b/Dockerfile_webots_cloud
index d719c90..2c82a2a 100644
--- a/Dockerfile_webots_cloud
+++ b/Dockerfile_webots_cloud
@@ -2,7 +2,7 @@ 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 && \
@@ -10,7 +10,7 @@ RUN apt update && apt install --yes unzip && \
   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/
diff --git a/README.md b/README.md
index 4ddc961..ca0f48b 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ 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
@@ -20,7 +20,7 @@ docker build . --file Dockerfile --tag cyberbotics/webots:latest [--build-arg BA
 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
diff --git a/Webots-R2023a.conf b/Webots-R2023b.conf
similarity index 94%
rename from Webots-R2023a.conf
rename to Webots-R2023b.conf
index 6860871..4b7ac5e 100644
--- a/Webots-R2023a.conf
+++ b/Webots-R2023b.conf
@@ -36,7 +36,7 @@ httpProxyPassword=
 httpProxyPort=0
 httpProxyType=2
 httpProxyUsername=
-uploadUrl=https://beta.webots.cloud
+uploadUrl=https://webots.cloud
 
 [OpenGL]
 GTAO=0
@@ -53,9 +53,6 @@ newBrowserWindow=false
 mute=true
 volume=80
 
-[Streaming]
-port=1234
-
 [View3d]
 hideAllCameraOverlays=false
 hideAllDisplayOverlays=false