Cleans up dockerfile.
This commit is contained in:
parent
2477fbfd10
commit
16a4956a29
|
@ -1,12 +1,8 @@
|
|||
FROM ubuntu:18.04
|
||||
|
||||
RUN apt-get update
|
||||
RUN apt-get install -y git
|
||||
RUN apt-get install -y qt5-default qt5-qmake qtmultimedia5-dev
|
||||
RUN apt-get install -y libqt5svg5-dev
|
||||
RUN apt-get install -y libssl-dev make g++
|
||||
RUN apt-get install -y wget
|
||||
RUN apt-get install -y fuse
|
||||
RUN apt-get install -y git wget fuse qttools5-dev-tools
|
||||
RUN apt-get install -y qt5-default qt5-qmake qtmultimedia5-dev libqt5svg5-dev libssl-dev make g++
|
||||
|
||||
RUN wget -O /usr/local/bin/linuxdeploy https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$(uname -m).AppImage
|
||||
RUN chmod +x /usr/local/bin/linuxdeploy
|
||||
|
@ -20,6 +16,4 @@ VOLUME /artifacts
|
|||
|
||||
ENTRYPOINT /compile.sh
|
||||
|
||||
RUN apt-get install -y qttools5-dev-tools
|
||||
|
||||
COPY compile.sh /compile.sh
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
version: '3'
|
||||
services:
|
||||
builder:
|
||||
image: "kristall-ci:1.0"
|
||||
# image: "kristall-ci:1.0"
|
||||
build: .
|
||||
volumes:
|
||||
- ./output:/artifacts
|
||||
devices:
|
||||
- /dev/fuse:/dev/fuse
|
||||
cap_add:
|
||||
- SYS_ADMIN
|
||||
- SYS_ADMIN
|
||||
|
|
Loading…
Reference in New Issue