Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

feat: Upgrade rolling base image to Ubuntu 22.04 #59

Merged
merged 2 commits into from
Aug 23, 2022
Merged

feat: Upgrade rolling base image to Ubuntu 22.04 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc4c14b
feat: Upgrade rolling base image to Ubuntu 22.04
Tiryoh Aug 21, 2022
075f8ec
fix: Fix docker pull error
Tiryoh Aug 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions rolling-arm64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down Expand Up @@ -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
9 changes: 3 additions & 6 deletions rolling/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down Expand Up @@ -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