mirror of
https://github.com/yuzu-emu/build-environments.git
synced 2024-11-22 11:35:38 +01:00
Update the docker images to run as yuzu user (UID 1027)
This commit is contained in:
parent
a222fcd7a7
commit
2f78410b2b
@ -1,6 +1,8 @@
|
|||||||
FROM ubuntu:20.04
|
FROM ubuntu:20.04
|
||||||
MAINTAINER yuzu
|
MAINTAINER yuzu
|
||||||
RUN useradd -m -s /bin/bash yuzu && \
|
# Create a user account yuzu (UID 1027) that the container will run as
|
||||||
|
RUN useradd -m -u 1027 -s /bin/bash yuzu && \
|
||||||
apt-get update && apt-get -y full-upgrade && \
|
apt-get update && apt-get -y full-upgrade && \
|
||||||
apt-get install -y git clang-format-6.0 && \
|
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
|
apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
|
||||||
|
USER 1027
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
FROM ubuntu:20.04
|
FROM ubuntu:20.04
|
||||||
MAINTAINER yuzu
|
MAINTAINER yuzu
|
||||||
|
RUN useradd -m -u 1027 -s /bin/bash yuzu && DEBIAN_FRONTEND=noninteractive apt-get update \
|
||||||
RUN useradd -m -s /bin/bash yuzu && DEBIAN_FRONTEND=noninteractive apt-get update \
|
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get -y full-upgrade \
|
&& DEBIAN_FRONTEND=noninteractive apt-get -y full-upgrade \
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||||
flatpak flatpak-builder \
|
flatpak flatpak-builder \
|
||||||
@ -11,6 +10,7 @@ RUN useradd -m -s /bin/bash yuzu && DEBIAN_FRONTEND=noninteractive apt-get updat
|
|||||||
wget git ccache cmake \
|
wget git ccache cmake \
|
||||||
ninja-build dnsutils gnupg2 \
|
ninja-build dnsutils gnupg2 \
|
||||||
sshfs fuse elfutils \
|
sshfs fuse elfutils \
|
||||||
&& rm -Rf /var/lib/apt/lists/* \
|
&& apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log \
|
||||||
&& flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo \
|
&& flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo \
|
||||||
&& flatpak install -v -y flathub org.kde.Platform//5.13 org.kde.Sdk//5.13
|
&& flatpak install -v -y flathub org.kde.Platform//5.13 org.kde.Sdk//5.13
|
||||||
|
USER 1027
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
FROM ubuntu:20.04
|
FROM ubuntu:20.04
|
||||||
MAINTAINER yuzu
|
MAINTAINER yuzu
|
||||||
RUN useradd -m -s /bin/bash yuzu && \
|
# Create a user account yuzu (UID 1027) that the container will run as
|
||||||
|
RUN useradd -m -u 1027 -s /bin/bash yuzu && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y full-upgrade && \
|
DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y full-upgrade && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
@ -25,7 +26,7 @@ RUN useradd -m -s /bin/bash yuzu && \
|
|||||||
ninja-build && \
|
ninja-build && \
|
||||||
pip3 install conan && \
|
pip3 install conan && \
|
||||||
apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
|
apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
|
||||||
USER yuzu
|
USER 1027
|
||||||
RUN conan install catch2/2.11.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
|
RUN conan install catch2/2.11.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
|
||||||
conan install fmt/6.2.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
|
conan install fmt/6.2.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
|
||||||
conan install nlohmann_json/3.7.3@ -s compiler.libcxx=libstdc++11 --build=missing
|
conan install nlohmann_json/3.7.3@ -s compiler.libcxx=libstdc++11 --build=missing
|
||||||
|
@ -3,7 +3,7 @@ MAINTAINER yuzu
|
|||||||
# Add mingw-repo "ownstuff" is a AUR with an up to date mingw64
|
# Add mingw-repo "ownstuff" is a AUR with an up to date mingw64
|
||||||
# Runs pacman -Syu twice in order to work around pacman issues where the first run only updates the current distro packages
|
# Runs pacman -Syu twice in order to work around pacman issues where the first run only updates the current distro packages
|
||||||
# and the second run actually pulls the updates from the repos.
|
# and the second run actually pulls the updates from the repos.
|
||||||
RUN useradd -m -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
|
RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
|
||||||
echo "[ownstuff]" >> /etc/pacman.conf && \
|
echo "[ownstuff]" >> /etc/pacman.conf && \
|
||||||
echo "SigLevel = Optional TrustAll" >> /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 && \
|
echo "Server = https://martchus.no-ip.biz/repo/arch/ownstuff/os/\$arch" >> /etc/pacman.conf && \
|
||||||
@ -48,7 +48,7 @@ RUN ln -s /usr/x86_64-w64-mingw32/lib/qt /usr/x86_64-w64-mingw32/lib/qt5
|
|||||||
# Install conan and add the mingw cross compile as the default profile
|
# Install conan and add the mingw cross compile as the default profile
|
||||||
RUN pip3 install conan
|
RUN pip3 install conan
|
||||||
COPY --chown=yuzu:yuzu default /home/yuzu/.conan/profiles/
|
COPY --chown=yuzu:yuzu default /home/yuzu/.conan/profiles/
|
||||||
USER yuzu
|
USER 1027
|
||||||
# Install/build the missing libs (uses the default mingw cross compile profile)
|
# Install/build the missing libs (uses the default mingw cross compile profile)
|
||||||
RUN conan install catch2/2.11.0@ --build=missing && \
|
RUN conan install catch2/2.11.0@ --build=missing && \
|
||||||
conan install fmt/6.2.0@ --build=missing && \
|
conan install fmt/6.2.0@ --build=missing && \
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
FROM alpine
|
FROM alpine
|
||||||
MAINTAINER yuzu
|
MAINTAINER yuzu
|
||||||
RUN adduser -u 1000 -D -s /bin/bash yuzu && \
|
RUN adduser -u 1027 -D -s /bin/bash yuzu && \
|
||||||
apk update && apk add build-base && \
|
apk update && apk add build-base \
|
||||||
cmake \
|
cmake \
|
||||||
python3-dev \
|
python3-dev \
|
||||||
qt5-qttools-dev \
|
qt5-qttools-dev \
|
||||||
qt5-qtmultimedia-dev && \
|
qt5-qtmultimedia-dev && \
|
||||||
pip3 install transifex-client && \
|
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/
|
rm -rf /var/cache/apk/*
|
||||||
|
USER 1027
|
||||||
|
Loading…
Reference in New Issue
Block a user