Updating Docker images

2 files changed, 25 insertions, 32 deletions

diff --git a/ci/dockerfiles/gnome-3-28-1804/Dockerfile b/ci/dockerfiles/gnome-3-28-1804/Dockerfile
index d00cdc4d7..8346f8f76 100644
--- a/ci/dockerfiles/gnome-3-28-1804/Dockerfile
+++ b/ci/dockerfiles/gnome-3-28-1804/Dockerfile
@@ -1,23 +1,14 @@
-FROM ubuntu:bionic
+FROM docker.io/ubuntudesktop/gnome-3-28-1804:latest
 
-RUN export DEBIAN_FRONTEND=noninteractive && \
-  apt-get update && \
-  apt-get dist-upgrade --yes && \
-  apt-get install --yes curl sudo jq squashfs-tools tzdata && \
-  curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core' | jq '.download_url' -r) --output core.snap && \
-  mkdir -p /snap/core && unsquashfs -d /snap/core/current core.snap && rm core.snap && \
-  curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core18' | jq '.download_url' -r) --output core18.snap && \
-  mkdir -p /snap/core18 && unsquashfs -d /snap/core18/current core18.snap && rm core18.snap && \
-  curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=candidate' | jq '.download_url' -r) --output snapcraft.snap && \
-  mkdir -p /snap/snapcraft && unsquashfs -d /snap/snapcraft/current snapcraft.snap && rm snapcraft.snap && \
-  curl -L https://raw.githubusercontent.com/snapcore/snapcraft/master/docker/bin/snapcraft-wrapper --output snapcraft-wrapper && \
-  mkdir -p /snap/bin && \
-  mv snapcraft-wrapper /snap/bin/snapcraft && \
-  chmod a+x /snap/bin/snapcraft && \
-  apt-get remove --yes --purge curl jq squashfs-tools && \
-  apt-get autoclean --yes && \
-  apt-get clean --yes
+LABEL description="Bootstrap image used to build the Remmina snap with" \
+                   maintainer="Antenore Gatta <antenore@simbiosi.org>" \
+                   vendor="Remmina Project" \
+                   name="org.remmina.Remmina.images.gnome-3-28-1804"
 
-ENV PATH=/snap/bin:$PATH
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
+# Set noninteractive
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN \
+    LC_ALL=en_US.UTF-8 apt-get -y update -qq \
+    && apt-get autoremove -y \
+    && apt-get clean -y
diff --git a/ci/dockerfiles/ubuntu-18.04/Dockerfile b/ci/dockerfiles/ubuntu-18.04/Dockerfile
index d36543304..c4bcd88aa 100644
--- a/ci/dockerfiles/ubuntu-18.04/Dockerfile
+++ b/ci/dockerfiles/ubuntu-18.04/Dockerfile
@@ -12,17 +12,19 @@ RUN \
     LC_ALL=en_US.UTF-8 apt-get update -qq \
     && apt-get install -y -qq software-properties-common python3-software-properties \
     && apt-add-repository ppa:remmina-ppa-team/freerdp-daily -y \
+    && apt-add-repository ppa:alexlarsson/flatpak -y \
     && apt-get update -qq \
-    && apt-get install -y -qq build-essential git-core cmake libssl-dev \
-    libx11-dev libxext-dev libxinerama-dev libxcursor-dev libxdamage-dev \
-    libxv-dev libxkbfile-dev libasound2-dev libcups2-dev libxml2 libxml2-dev \
-    libxrandr-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
-    libxi-dev libavutil-dev libavcodec-dev libxtst-dev libgtk-3-dev \
-    libgcrypt11-dev libssh-dev libpulse-dev libvte-2.91-dev libxkbfile-dev \
-    libtelepathy-glib-dev libjpeg-dev libgnutls28-dev libgnome-keyring-dev \
-    libavahi-ui-gtk3-dev libvncserver-dev libappindicator3-dev intltool \
-    libsecret-1-dev libsodium-dev libwebkit2gtk-4.0-dev libsystemd-dev \
-    libsoup2.4-dev libjson-glib-dev libavresample-dev freerdp2-dev \
-    libspice-protocol-dev libspice-client-gtk-3.0-dev \
+    && apt-get install -y -qq flatpak-builder flatpak build-essential git-core \
+    cmake curl freerdp2-dev intltool libappindicator3-dev libasound2-dev \
+    libavahi-ui-gtk3-dev libavcodec-dev libavresample-dev libavutil-dev \
+    libcups2-dev libgcrypt11-dev libgnome-keyring-dev libgnutls28-dev \
+    libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libgtk-3-dev \
+    libjpeg-dev libjson-glib-dev libpcre2-8-0 libpcre2-dev libpulse-dev \
+    libsecret-1-dev libsodium-dev libsoup2.4-dev libspice-client-gtk-3.0-dev \
+    libspice-protocol-dev libssh-dev libssl-dev libsystemd-dev \
+    libtelepathy-glib-dev libvncserver-dev libvte-2.91-dev libwebkit2gtk-4.0-dev \
+    libx11-dev libxcursor-dev libxdamage-dev libxext-dev libxi-dev \
+    libxinerama-dev libxkbfile-dev libxkbfile-dev libxml2 libxml2-dev \
+    libxrandr-dev libxtst-dev libxv-dev python3 python3-dev wget \
     && apt-get autoremove -y \
     && apt-get clean -y