diff options
| author | Felix (xq) Queißner <git@mq32.de> | 2020-06-30 14:17:13 +0200 |
|---|---|---|
| committer | Felix (xq) Queißner <git@mq32.de> | 2020-06-30 14:17:13 +0200 |
| commit | 16a4956a298e36e118478cef7359c6acb87e77f0 (patch) | |
| tree | 3b5a0f909fe4a6fe075b53b9ca8bfcc769ccb8e6 /ci | |
| parent | 2477fbfd100d00221cd0b51d22c32ba3618a8c2f (diff) | |
| download | kristall-16a4956a298e36e118478cef7359c6acb87e77f0.tar.gz | |
Cleans up dockerfile.
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/Dockerfile | 10 | ||||
| -rw-r--r-- | ci/docker-compose.yml | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/ci/Dockerfile b/ci/Dockerfile index 0475622..c573491 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -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 diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml index 1ccff4a..9a77052 100644 --- a/ci/docker-compose.yml +++ b/ci/docker-compose.yml @@ -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
\ No newline at end of file + - SYS_ADMIN |