From 2f65db6e841a0a10fa5f904fddcb254200669223 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sat, 13 Apr 2019 19:09:44 -0600 Subject: [PATCH] meta: remove regular users from all the images --- linux-clang-format/Dockerfile | 2 -- linux-fresh/Dockerfile | 2 -- linux-frozen/Dockerfile | 3 +-- linux-mingw/Dockerfile | 3 +-- linux-transifex/Dockerfile | 2 -- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/linux-clang-format/Dockerfile b/linux-clang-format/Dockerfile index 11b6018..c8a4a55 100644 --- a/linux-clang-format/Dockerfile +++ b/linux-clang-format/Dockerfile @@ -1,6 +1,4 @@ FROM ubuntu:18.04 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-fresh/Dockerfile b/linux-fresh/Dockerfile index e55899a..9f77bcf 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -1,6 +1,4 @@ FROM ubuntu:18.04 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 d72dfb9..435b2b1 100644 --- a/linux-frozen/Dockerfile +++ b/linux-frozen/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:18.04 LABEL maintainer="citraemu" -RUN useradd -m -s /bin/bash citra && mkdir -p /tmp/pkgs +RUN 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 RUN cd /tmp/pkgs && python2 install_package.py \ @@ -16,4 +16,3 @@ 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 49569b7..d6b420b 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:18.04 LABEL maintainer="citraemu" -RUN useradd -m -s /bin/bash citra && mkdir -p /tmp/pkgs +RUN 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 COPY errno.h /usr/x86_64-w64-mingw32/include/ @@ -10,4 +10,3 @@ 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 43053cc..a8bc8d1 100644 --- a/linux-transifex/Dockerfile +++ b/linux-transifex/Dockerfile @@ -1,6 +1,4 @@ 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