From 5569ee3eb35be12421f26cc090a389543b09d772 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Fri, 15 Jun 2018 22:06:12 -0600 Subject: [PATCH] Prepare for self-hosted CI (#3) Prepare for self-hosted CI --- linux-fresh/Dockerfile | 1 + linux-frozen/Dockerfile | 3 ++- linux-mingw/Dockerfile | 1 + linux-transifex/Dockerfile | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index fe8a9ce..c8698cd 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -1,4 +1,5 @@ FROM ubuntu:18.04 MAINTAINER citra +RUN useradd -m -s /bin/bash citra RUN apt-get update && apt-get -y full-upgrade RUN apt-get install -y build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools wget git ccache cmake diff --git a/linux-frozen/Dockerfile b/linux-frozen/Dockerfile index c3a4686..84f6607 100644 --- a/linux-frozen/Dockerfile +++ b/linux-frozen/Dockerfile @@ -1,11 +1,12 @@ FROM ubuntu:18.04 MAINTAINER citra -RUN mkdir -p /tmp/pkgs +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 RUN cd /tmp/pkgs && python2 install_package.py \ libsdl2-dev 2.0.7+dfsg1-3ubuntu1 bionic \ qtbase5-dev 5.9.3+dfsg-0ubuntu2 bionic \ + qttools5-dev-tools 5.9.5-0ubuntu1 bionic \ libqt5opengl5-dev 5.9.3+dfsg-0ubuntu2 bionic \ qt5-qmltooling-plugins 5.9.3-0ubuntu1 bionic \ qtdeclarative5-dev 5.9.3-0ubuntu1 bionic \ diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index 1991926..cc72e49 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:18.04 MAINTAINER citra +RUN useradd -m -s /bin/bash citra RUN apt-get update && apt-get install -y gpg wget git python3-pip ccache g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools cmake # workaround broken headers in Ubuntu MinGW package COPY errno.h /usr/x86_64-w64-mingw32/include/ diff --git a/linux-transifex/Dockerfile b/linux-transifex/Dockerfile index 405d53f..382ff6d 100644 --- a/linux-transifex/Dockerfile +++ b/linux-transifex/Dockerfile @@ -1,3 +1,4 @@ FROM alpine +RUN useradd -m -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