Browse Source
Merge pull request #19 from liushuyu/refresh
Fix the regression introduced in #18
master
Flame Sage
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
2 additions and
10 deletions
-
linux-clang-format/Dockerfile
-
linux-fresh/Dockerfile
-
linux-frozen/Dockerfile
-
linux-mingw/Dockerfile
-
linux-transifex/Dockerfile
|
|
@ -1,6 +1,4 @@ |
|
|
FROM ubuntu:18.04 |
|
|
FROM ubuntu:18.04 |
|
|
LABEL maintainer="citraemu" |
|
|
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 git clang-format-6.0 |
|
|
RUN apt-get install -y git clang-format-6.0 |
|
|
USER citra |
|
|
|
|
|
@ -1,6 +1,4 @@ |
|
|
FROM ubuntu:18.04 |
|
|
FROM ubuntu:18.04 |
|
|
LABEL maintainer="citraemu" |
|
|
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 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 |
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
FROM ubuntu:18.04 |
|
|
FROM ubuntu:18.04 |
|
|
LABEL maintainer="citraemu" |
|
|
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 |
|
|
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 |
|
|
RUN cd /tmp/pkgs && python2 install_package.py \ |
|
|
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 \ |
|
|
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 |
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
FROM ubuntu:18.04 |
|
|
FROM ubuntu:18.04 |
|
|
LABEL maintainer="citraemu" |
|
|
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 |
|
|
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 |
|
|
COPY errno.h /usr/x86_64-w64-mingw32/include/ |
|
|
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 |
|
|
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 |
|
|
|
|
|
@ -1,6 +1,4 @@ |
|
|
FROM alpine |
|
|
FROM alpine |
|
|
LABEL maintainer="citraemu" |
|
|
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 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 |
|
|
|