feat: Upgrade rolling base image to Ubuntu 22.04 (#59)

Tiryoh · Aug 23, 2022 · ba79f5f · ba79f5f
1 parent abbde61
commit ba79f5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/rolling-arm64/Dockerfile b/rolling-arm64/Dockerfile
@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM dorowu/ubuntu-desktop-lxde-vnc:focal-arm64
+FROM tiryoh/ubuntu-desktop-lxde-vnc:jammy
 LABEL maintainer="Tiryoh<tiryoh@gmail.com>"
 
+SHELL ["/bin/bash", "-c"]
+
 RUN apt-get update -q && \
     apt-get upgrade -yq && \
     DEBIAN_FRONTEND=noninteractive apt-get install -yq wget curl git build-essential vim sudo lsb-release locales bash-completion tzdata gosu && \
@@ -43,8 +45,4 @@ RUN gosu ubuntu rosdep update && \
     grep -F "source /opt/ros/${ROS_DISTRO}/setup.bash" /home/ubuntu/.bashrc || echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> /home/ubuntu/.bashrc && \
     sudo chown ubuntu:ubuntu /home/ubuntu/.bashrc
 
-# temporally fix to enable resize uri
-# https://github.com/fcwu/docker-ubuntu-vnc-desktop/pull/247
-RUN sed -i "s#location ~ .*/(api/.*|websockify) {#location ~ .*/(api/.*|websockify|resize) {#" /etc/nginx/sites-enabled/default
-
 ENV USER ubuntu
diff --git a/rolling/Dockerfile b/rolling/Dockerfile
@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM dorowu/ubuntu-desktop-lxde-vnc:focal
+FROM tiryoh/ubuntu-desktop-lxde-vnc:jammy
 LABEL maintainer="Tiryoh<tiryoh@gmail.com>"
 
-RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - 
+SHELL ["/bin/bash", "-c"]
+
 RUN apt-get update -q && \
     apt-get upgrade -yq && \
     DEBIAN_FRONTEND=noninteractive apt-get install -yq wget curl git build-essential vim sudo lsb-release locales bash-completion tzdata gosu && \
@@ -44,8 +45,4 @@ RUN gosu ubuntu rosdep update && \
     grep -F "source /opt/ros/${ROS_DISTRO}/setup.bash" /home/ubuntu/.bashrc || echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> /home/ubuntu/.bashrc && \
     sudo chown ubuntu:ubuntu /home/ubuntu/.bashrc
 
-# temporally fix to enable resize uri
-# https://github.com/fcwu/docker-ubuntu-vnc-desktop/pull/247
-RUN sed -i "s#location ~ .*/(api/.*|websockify) {#location ~ .*/(api/.*|websockify|resize) {#" /etc/nginx/sites-enabled/default
-
 ENV USER ubuntu