diff --git a/linux-clang-format/Dockerfile b/linux-clang-format/Dockerfile index 4b5cf51..cc69488 100644 --- a/linux-clang-format/Dockerfile +++ b/linux-clang-format/Dockerfile @@ -1,8 +1,6 @@ FROM ubuntu:20.04 MAINTAINER yuzu -RUN useradd -m -s /bin/bash yuzu -RUN apt-get update && apt-get -y full-upgrade -RUN apt-get install -y git clang-format-6.0 - -# cleanup all extra information that apt may be caching to save storage space -RUN apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/{apt,dpkg,cache,log}/ +RUN useradd -m -s /bin/bash yuzu && \ + apt-get update && apt-get -y full-upgrade && \ + apt-get install -y git clang-format-6.0 && \ + apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index 627d35c..3e3d56a 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -1,20 +1,19 @@ FROM ubuntu:20.04 MAINTAINER yuzu -RUN useradd -m -s /bin/bash yuzu -RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y full-upgrade -RUN DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ +RUN useradd -m -s /bin/bash yuzu && \ + DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y full-upgrade && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ build-essential \ libsdl2-dev \ libssl-dev \ python \ qtbase5-dev \ + qtbase5-private-dev \ qtwebengine5-dev \ libqt5opengl5-dev \ wget \ git \ ccache \ cmake \ - ninja-build - -# cleanup all extra information that apt may be caching to save storage space -RUN apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/{apt,dpkg,cache,log}/ + ninja-build && \ + apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index a230aad..7fee4e4 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -1,13 +1,13 @@ FROM archlinux:latest MAINTAINER yuzu -RUN useradd -m -s /bin/bash yuzu && mkdir -p /tmp/pkgs # Add mingw-repo "ownstuff" is a AUR with an up to date mingw64 -RUN echo "[ownstuff]" >> /etc/pacman.conf \ - && echo "SigLevel = Optional TrustAll" >> /etc/pacman.conf \ - && echo "Server = https://martchus.no-ip.biz/repo/arch/ownstuff/os/\$arch" >> /etc/pacman.conf -RUN pacman -Syu --noconfirm -RUN pacman -Syu --noconfirm -RUN pacman -S --needed --noconfirm --noprogressbar \ +RUN useradd -m -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \ + echo "[ownstuff]" >> /etc/pacman.conf && \ + echo "SigLevel = Optional TrustAll" >> /etc/pacman.conf && \ + echo "Server = https://martchus.no-ip.biz/repo/arch/ownstuff/os/\$arch" >> /etc/pacman.conf && \ + pacman -Syu --noconfirm && \ + pacman -Syu --noconfirm && \ + pacman -S --needed --noconfirm --noprogressbar \ base-devel \ gnupg \ wget \ @@ -28,16 +28,14 @@ RUN pacman -S --needed --noconfirm --noprogressbar \ mingw-w64-qt5-winextras \ python2 \ mingw-w64-opus \ - mingw-w64-winpthreads + mingw-w64-winpthreads && \ + pacman -Scc --noconfirm && \ + rm -rf /usr/share/man/ /tmp/ /var/tmp/ -COPY mingw-setup.sh /tmp/pkgs -RUN cd /tmp/pkgs && bash -e mingw-setup.sh +COPY mingw-setup.sh /tmp/ +RUN cd /tmp/ && bash -e mingw-setup.sh # Compatibility with the old Ubuntu MingW image RUN ln -s /usr/x86_64-w64-mingw32/lib/qt /usr/x86_64-w64-mingw32/lib/qt5 # Cleanup USER root -RUN pacman -Scc --noconfirm -RUN rm -rf /usr/share/man/*; \ - rm -rf /tmp/*; \ - rm -rf /var/tmp/*; diff --git a/linux-transifex/Dockerfile b/linux-transifex/Dockerfile index 5531753..acdfa1e 100644 --- a/linux-transifex/Dockerfile +++ b/linux-transifex/Dockerfile @@ -1,7 +1,10 @@ FROM alpine -RUN adduser -u 1000 -D -s /bin/bash yuzu -RUN apk update && apk add build-base cmake python3-dev qt5-qttools-dev qt5-qtmultimedia-dev -RUN pip3 install transifex-client - -# cleanup all extra information that apt may be caching to save storage space -RUN apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/{apt,dpkg,cache,log}/ +MAINTAINER yuzu +RUN adduser -u 1000 -D -s /bin/bash yuzu && \ + apk update && apk add build-base && \ + cmake \ + python3-dev \ + qt5-qttools-dev \ + qt5-qtmultimedia-dev && \ + pip3 install transifex-client && \ + apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log/