Merge pull request #246 from pelican-eggs/samp
Add libssl1.1 for samp and openmp
This commit is contained in:
@@ -7,14 +7,20 @@ RUN apt update \
|
|||||||
RUN dpkg --add-architecture i386 \
|
RUN dpkg --add-architecture i386 \
|
||||||
&& apt update \
|
&& apt update \
|
||||||
&& apt upgrade -y \
|
&& apt upgrade -y \
|
||||||
&& apt install -y libstdc++6 lib32stdc++6 tar curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip tini \
|
&& apt install -y libstdc++6 lib32stdc++6 tar wget curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip tini \
|
||||||
&& apt install -y libtbb12:i386 libtbb-dev:i386 libicu-dev:i386 \
|
&& apt install -y libtbb12:i386 libtbb-dev:i386 libicu-dev:i386 \
|
||||||
&& useradd -d /home/container -m container
|
&& useradd -d /home/container -m container
|
||||||
|
|
||||||
RUN mkdir -p /run/systemd && echo 'docker' > /run/systemd/container
|
RUN mkdir -p /run/systemd && echo 'docker' > /run/systemd/container
|
||||||
RUN rm -rf /var/lib/apt/lists/*
|
RUN rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Temp fix for things that still need libssl1.1 32 bit
|
||||||
|
RUN if [ "$(uname -m)" = "x86_64" ]; then \
|
||||||
|
wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_i386.deb && \
|
||||||
|
dpkg -i libssl1.1_1.1.0g-2ubuntu4_i386.deb && \
|
||||||
|
rm libssl1.1_1.1.0g-2ubuntu4_i386.deb; \
|
||||||
|
fi
|
||||||
|
|
||||||
USER container
|
USER container
|
||||||
ENV USER=container HOME=/home/container
|
ENV USER=container HOME=/home/container
|
||||||
WORKDIR /home/container
|
WORKDIR /home/container
|
||||||
|
Reference in New Issue
Block a user