Several Improvements (#18)

* linux-flatpak: slim down the image

* meta: conform to new Dockerfile standard

* meta: use regular user as possible
This commit is contained in:
liushuyu 2019-04-13 17:12:09 -06:00 committed by Flame Sage
parent f2afbf2489
commit 281b0174f1
6 changed files with 12 additions and 7 deletions

View File

@ -1,5 +1,6 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
MAINTAINER citra LABEL maintainer="citraemu"
RUN useradd -m -s /bin/bash citra RUN useradd -m -s /bin/bash citra
RUN apt-get update && apt-get -y full-upgrade RUN apt-get update && apt-get -y full-upgrade
RUN apt-get install -y git clang-format-6.0 RUN apt-get install -y git clang-format-6.0
USER citra

View File

@ -1,7 +1,6 @@
FROM ubuntu:18.04 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 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 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 RUN flatpak install -y flathub org.kde.Platform//5.12 org.kde.Sdk//5.12

View File

@ -1,5 +1,6 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
MAINTAINER citra LABEL maintainer="citraemu"
RUN useradd -m -s /bin/bash citra RUN useradd -m -s /bin/bash citra
RUN apt-get update && apt-get -y full-upgrade 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 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

View File

@ -1,5 +1,5 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
MAINTAINER citra LABEL maintainer="citraemu"
RUN useradd -m -s /bin/bash citra && mkdir -p /tmp/pkgs RUN useradd -m -s /bin/bash citra && mkdir -p /tmp/pkgs
COPY install_package.py /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 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 \ libavformat-dev 7:3.4.4-0ubuntu0.18.04.1 bionic \
libswscale-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 RUN rm -rf /tmp/pkgs
USER citra

View File

@ -1,5 +1,5 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
MAINTAINER citra LABEL maintainer="citraemu"
RUN useradd -m -s /bin/bash citra && mkdir -p /tmp/pkgs 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 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 # 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 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 COPY mingw-setup.sh /tmp/pkgs
RUN cd /tmp/pkgs && bash -e mingw-setup.sh RUN cd /tmp/pkgs && bash -e mingw-setup.sh
USER citra

View File

@ -1,4 +1,6 @@
FROM alpine FROM alpine
LABEL maintainer="citraemu"
RUN adduser -u 1000 -D -s /bin/bash citra 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 apk update && apk add build-base cmake python3-dev qt5-qttools-dev qt5-qtmultimedia-dev
RUN pip3 install transifex-client RUN pip3 install transifex-client
USER citra