Skip to content
Snippets Groups Projects
Commit cfa2812b authored by Stefan Kraus's avatar Stefan Kraus
Browse files

Clean up dockerfile, use correct patch

parent 05e6781d
No related branches found
No related tags found
No related merge requests found
...@@ -11,7 +11,7 @@ diff --git a/proxy.py b/proxy.py ...@@ -11,7 +11,7 @@ diff --git a/proxy.py b/proxy.py
index db4044a..4535fac 100644 index db4044a..4535fac 100644
--- a/proxy.py --- a/proxy.py
+++ b/proxy.py +++ b/proxy.py
@@ -15,8 +15,8 @@ from base64 import b64encode @@ -15,7 +15,7 @@ from base64 import b64encode
app = Flask(__name__) app = Flask(__name__)
......
FROM ubuntu:19.04 FROM ubuntu:19.04
RUN apt-get update && apt-get -y install \ RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
git \ git \
locales \ locales \
wget \ wget \
...@@ -13,10 +13,23 @@ RUN apt-get update && apt-get -y install \ ...@@ -13,10 +13,23 @@ RUN apt-get update && apt-get -y install \
libsodium-dev \ libsodium-dev \
libprotobuf-dev \ libprotobuf-dev \
qt5-default \ qt5-default \
qml-module-qtgraphicaleffects qml-module-qtgraphicaleffects \
libsodium23 \
pkg-config \
libncurses5-dev \
libncurses5 \
python3 \
python3-pip \
tmux \
screen \
vim \
fonts-symbola \
python3-dateutil \
qtbase5-dev \
qtdeclarative5-dev \
protobuf-compiler
RUN apt-get update && apt-get -y install \ RUN pip3 install flask
libsodium23
RUN echo "de_DE.UTF-8 UTF-8\nen_GB.UTF-8\nen_US.UTF-8 UTF-8\n" > /etc/locale.gen RUN echo "de_DE.UTF-8 UTF-8\nen_GB.UTF-8\nen_US.UTF-8 UTF-8\n" > /etc/locale.gen
RUN locale-gen RUN locale-gen
...@@ -37,10 +50,6 @@ RUN git am 0002-Add-case-that-no-freeze-is-used-in-a-contest.patch ...@@ -37,10 +50,6 @@ RUN git am 0002-Add-case-that-no-freeze-is-used-in-a-contest.patch
WORKDIR /root WORKDIR /root
RUN git clone https://github.com/TPolzer/Carnifex RUN git clone https://github.com/TPolzer/Carnifex
RUN apt-get -y install \
pkg-config \
libncurses5-dev \
libncurses5
WORKDIR /root/Carnifex WORKDIR /root/Carnifex
RUN git am /root/carniprox/carnifex_patch.patch RUN git am /root/carniprox/carnifex_patch.patch
...@@ -48,29 +57,10 @@ RUN git am /root/carniprox/carnifex_patch.patch ...@@ -48,29 +57,10 @@ RUN git am /root/carniprox/carnifex_patch.patch
ENV GOPATH=/root/Carnifex ENV GOPATH=/root/Carnifex
RUN go get github.com/golang/protobuf/proto github.com/rthornton128/goncurses golang.org/x/crypto/nacl/secretbox golang.org/x/crypto/scrypt RUN go get github.com/golang/protobuf/proto github.com/rthornton128/goncurses golang.org/x/crypto/nacl/secretbox golang.org/x/crypto/scrypt
RUN apt-get -y install \
qtbase5-dev \
qtdeclarative5-dev \
protobuf-compiler
RUN go build server RUN go build server
RUN cmake src/client RUN cmake src/client
RUN make -j4 RUN make -j4
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
python3 \
python3-pip \
tmux \
screen \
vim \
fonts-symbola
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
python3-dateutil
#COPY config.json /root/Carnifex
#COPY credentials.json /root/Carnifex
WORKDIR /root/carniprox WORKDIR /root/carniprox
RUN pip3 install flask CMD ["/bin/bash"]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment