From 281b0174f15ad80e6db788d8dab5658e9dc2f021 Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Sat, 13 Apr 2019 17:12:09 -0600
Subject: [PATCH] Several Improvements (#18)

* linux-flatpak: slim down the image

* meta: conform to new Dockerfile standard

* meta: use regular user as possible
---
 linux-clang-format/Dockerfile | 3 ++-
 linux-flatpak/Dockerfile      | 5 ++---
 linux-fresh/Dockerfile        | 3 ++-
 linux-frozen/Dockerfile       | 3 ++-
 linux-mingw/Dockerfile        | 3 ++-
 linux-transifex/Dockerfile    | 2 ++
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/linux-clang-format/Dockerfile b/linux-clang-format/Dockerfile
index 06d3b3b..11b6018 100644
--- a/linux-clang-format/Dockerfile
+++ b/linux-clang-format/Dockerfile
@@ -1,5 +1,6 @@
 FROM ubuntu:18.04
-MAINTAINER citra
+LABEL maintainer="citraemu"
 RUN useradd -m -s /bin/bash citra
 RUN apt-get update && apt-get -y full-upgrade
 RUN apt-get install -y git clang-format-6.0
+USER citra
diff --git a/linux-flatpak/Dockerfile b/linux-flatpak/Dockerfile
index ab0c5f3..b42379f 100644
--- a/linux-flatpak/Dockerfile
+++ b/linux-flatpak/Dockerfile
@@ -1,7 +1,6 @@
 FROM ubuntu:18.04
-MAINTAINER citra
-RUN useradd -m -s /bin/bash citra
+LABEL maintainer="citraemu"
 RUN apt-get update && apt-get -y full-upgrade
-RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools libavcodec-dev libavformat-dev libswscale-dev wget git ccache cmake flatpak flatpak-builder ca-certificates sshfs curl fuse dnsutils gnupg2
+RUN apt-get install -y p7zip-full wget git flatpak flatpak-builder ca-certificates sshfs curl fuse dnsutils gnupg2
 RUN flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 RUN flatpak install -y flathub org.kde.Platform//5.12 org.kde.Sdk//5.12
diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile
index dacf9d8..e55899a 100644
--- a/linux-fresh/Dockerfile
+++ b/linux-fresh/Dockerfile
@@ -1,5 +1,6 @@
 FROM ubuntu:18.04
-MAINTAINER citra
+LABEL maintainer="citraemu"
 RUN useradd -m -s /bin/bash citra
 RUN apt-get update && apt-get -y full-upgrade
 RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools libavcodec-dev libavformat-dev libswscale-dev wget git ccache cmake ninja-build
+USER citra
diff --git a/linux-frozen/Dockerfile b/linux-frozen/Dockerfile
index 5fa2761..d72dfb9 100644
--- a/linux-frozen/Dockerfile
+++ b/linux-frozen/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:18.04
-MAINTAINER citra
+LABEL maintainer="citraemu"
 RUN useradd -m -s /bin/bash citra && mkdir -p /tmp/pkgs
 COPY install_package.py /tmp/pkgs
 RUN apt-get update && apt-get install -y build-essential wget git python-launchpadlib ccache ninja-build
@@ -16,3 +16,4 @@ RUN cd /tmp/pkgs && python2 install_package.py \
     libavformat-dev 7:3.4.4-0ubuntu0.18.04.1 bionic  \
     libswscale-dev 7:3.4.4-0ubuntu0.18.04.1 bionic
 RUN rm -rf /tmp/pkgs
+USER citra
diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile
index cf19a76..49569b7 100644
--- a/linux-mingw/Dockerfile
+++ b/linux-mingw/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:18.04
-MAINTAINER citra
+LABEL maintainer="citraemu"
 RUN useradd -m -s /bin/bash citra && mkdir -p /tmp/pkgs
 RUN apt-get update && apt-get install -y gpg wget git python3-pip ccache p7zip-full g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools cmake ninja-build
 # workaround broken headers in Ubuntu MinGW package
@@ -10,3 +10,4 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv '72931B477E22FEFD47F8DEC
 RUN apt-get install -y sdl2-mingw-w64 qt5base-mingw-w64 qt5tools-mingw-w64 libsamplerate-mingw-w64 qt5multimedia-mingw-w64
 COPY mingw-setup.sh /tmp/pkgs
 RUN cd /tmp/pkgs && bash -e mingw-setup.sh
+USER citra
diff --git a/linux-transifex/Dockerfile b/linux-transifex/Dockerfile
index 1662ae7..43053cc 100644
--- a/linux-transifex/Dockerfile
+++ b/linux-transifex/Dockerfile
@@ -1,4 +1,6 @@
 FROM alpine
+LABEL maintainer="citraemu"
 RUN adduser -u 1000 -D -s /bin/bash citra
 RUN apk update && apk add build-base cmake python3-dev qt5-qttools-dev qt5-qtmultimedia-dev
 RUN pip3 install transifex-client
+USER citra