Fix ros base

Dockerfile.amd64

@@ -4,7 +4,7 @@
 # base system
 ################################################################################
 
-FROM ubuntu:18.04 as system
+FROM osrf/ros:melodic-desktop-full as system
 
 
 
@@ -14,32 +14,32 @@ RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirr
 # built-in packages
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt update \
-    && apt install -y --no-install-recommends software-properties-common curl apache2-utils \
-    && apt update \
-    && apt install -y --no-install-recommends --allow-unauthenticated \
-        supervisor nginx sudo net-tools zenity xz-utils \
-        dbus-x11 x11-utils alsa-utils \
-        mesa-utils libgl1-mesa-dri \
-    && apt autoclean -y \
-    && apt autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
+  && apt install -y --no-install-recommends software-properties-common curl apache2-utils \
+  && apt update \
+  && apt install -y --no-install-recommends --allow-unauthenticated \
+  supervisor nginx sudo net-tools zenity xz-utils \
+  dbus-x11 x11-utils alsa-utils \
+  mesa-utils libgl1-mesa-dri \
+  && apt autoclean -y \
+  && apt autoremove -y \
+  && rm -rf /var/lib/apt/lists/*
 # install debs error if combine together
 RUN add-apt-repository -y ppa:fcwu-tw/apps \
-    && apt update \
-    && apt install -y --no-install-recommends --allow-unauthenticated \
-        xvfb x11vnc=0.9.16-1 \
-        vim-tiny firefox chromium-browser ttf-ubuntu-font-family ttf-wqy-zenhei  \
-    && add-apt-repository -r ppa:fcwu-tw/apps \
-    && apt autoclean -y \
-    && apt autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
+  && apt update \
+  && apt install -y --no-install-recommends --allow-unauthenticated \
+  xvfb x11vnc=0.9.16-1 \
+  vim-tiny firefox chromium-browser ttf-ubuntu-font-family ttf-wqy-zenhei  \
+  && add-apt-repository -r ppa:fcwu-tw/apps \
+  && apt autoclean -y \
+  && apt autoremove -y \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN apt update \
-    && apt install -y --no-install-recommends --allow-unauthenticated \
-        lxde gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \
-    && apt autoclean -y \
-    && apt autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
+  && apt install -y --no-install-recommends --allow-unauthenticated \
+  lxde gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \
+  && apt autoclean -y \
+  && apt autoremove -y \
+  && rm -rf /var/lib/apt/lists/*
 
 
 # Additional packages require ~600MB
@@ -52,53 +52,53 @@ RUN chmod +x /bin/tini
 
 # ffmpeg
 RUN apt update \
-    && apt install -y --no-install-recommends --allow-unauthenticated \
-        ffmpeg \
-    && rm -rf /var/lib/apt/lists/* \
-    && mkdir /usr/local/ffmpeg \
-    && ln -s /usr/bin/ffmpeg /usr/local/ffmpeg/ffmpeg
+  && apt install -y --no-install-recommends --allow-unauthenticated \
+  ffmpeg \
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir /usr/local/ffmpeg \
+  && ln -s /usr/bin/ffmpeg /usr/local/ffmpeg/ffmpeg
 
 # python library
 COPY rootfs/usr/local/lib/web/backend/requirements.txt /tmp/
 RUN apt-get update \
-    && dpkg-query -W -f='${Package}\n' > /tmp/a.txt \
-    && apt-get install -y python-pip python-dev build-essential \
-	&& pip install setuptools wheel && pip install -r /tmp/requirements.txt \
-    && dpkg-query -W -f='${Package}\n' > /tmp/b.txt \
-    && apt-get remove -y `diff --changed-group-format='%>' --unchanged-group-format='' /tmp/a.txt /tmp/b.txt | xargs` \
-    && apt-get autoclean -y \
-    && apt-get autoremove -y \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /var/cache/apt/* /tmp/a.txt /tmp/b.txt
+  && dpkg-query -W -f='${Package}\n' > /tmp/a.txt \
+  && apt-get install -y python-pip python-dev build-essential \
+  && pip install setuptools wheel && pip install -r /tmp/requirements.txt \
+  && dpkg-query -W -f='${Package}\n' > /tmp/b.txt \
+  && apt-get remove -y `diff --changed-group-format='%>' --unchanged-group-format='' /tmp/a.txt /tmp/b.txt | xargs` \
+  && apt-get autoclean -y \
+  && apt-get autoremove -y \
+  && rm -rf /var/lib/apt/lists/* \
+  && rm -rf /var/cache/apt/* /tmp/a.txt /tmp/b.txt
 
 
 ################################################################################
 # builder
 ################################################################################
-FROM ubuntu:18.04 as builder
+FROM osrf/ros:melodic-desktop-full as builder
 
 
 RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list;
 
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends curl ca-certificates gnupg patch
+  && apt-get install -y --no-install-recommends curl ca-certificates gnupg patch
 
 # nodejs
 RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
-    && apt-get install -y nodejs
+  && apt-get install -y nodejs
 
 # yarn
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && apt-get update \
-    && apt-get install -y yarn
+  && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+  && apt-get update \
+  && apt-get install -y yarn
 
 # build frontend
 COPY web /src/web
 RUN cd /src/web \
-    && yarn \
-    && yarn build
+  && yarn \
+  && yarn build
 RUN sed -i 's#app/locale/#novnc/app/locale/#' /src/web/dist/static/novnc/app/ui.js
 
 
@@ -112,11 +112,11 @@ LABEL maintainer="fcwu.tw@gmail.com"
 COPY --from=builder /src/web/dist/ /usr/local/lib/web/frontend/
 COPY rootfs /
 RUN ln -sf /usr/local/lib/web/frontend/static/websockify /usr/local/lib/web/frontend/static/novnc/utils/websockify && \
-	chmod +x /usr/local/lib/web/frontend/static/websockify/run
+  chmod +x /usr/local/lib/web/frontend/static/websockify/run
 
 EXPOSE 80
 WORKDIR /root
 ENV HOME=/home/ubuntu \
-    SHELL=/bin/bash
+  SHELL=/bin/bash
 HEALTHCHECK --interval=30s --timeout=5s CMD curl --fail http://127.0.0.1:6079/api/health
 ENTRYPOINT ["/startup.sh"]