diff --git a/.dockerignore b/.dockerignore index 3c64cac..3dcb17f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,26 +1,30 @@ -.idea -*/thumbs -*.cbp -CMakeCache.txt -CMakeFiles -cmake-build-debug -cmake_install.cmake +.idea/ +*.sist2 +docs/ +test_i/ +test_i_inc/ +Testing/ +.drone.yml +**/cmake_install.cmake +**/CMakeCache.txt +**/CMakeFiles/ +LICENSE Makefile -*.out -LOG -sist2* -index.sist2/ -bundle*.css -bundle.js -**/*.a -**/vgcore.* -build/ +**/*.md +**/*.cbp +VERSION +**/node_modules/ .git/ -third-party/libscan/libscan-test-files/ +sist2-*-linux-debug +sist2-*-linux +sist2_debug +sist2 +**/libscan-test-files +**/scan_ub_test +**/scan_a_test +**/scan_test **/ext_ffmpeg **/ext_libmobi -**/scan_a_test -Dockerfile -*.idx/ -VERSION -sist2-vue/node_modules/ \ No newline at end of file +**/ext_libwpd +**/core +*.a \ No newline at end of file diff --git a/.drone.yml b/.drone.yml index 44d5d8e..6e17759 100644 --- a/.drone.yml +++ b/.drone.yml @@ -71,3 +71,18 @@ steps: source: - ./sist2-arm64-linux - ./sist2-arm64-linux-debug + - name: docker + image: plugins/docker + settings: + username: + from_secret: DOCKER_USER + password: + from_secret: DOCKER_PASSWORD + repo: simon987/sist2 + context: ./ + dockerfile: ./Dockerfile + auto_tag: true + auto_tag_suffix: arm64-linux + when: + event: + - tag diff --git a/Dockerfile b/Dockerfile index 0f0b03c..af97d10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,12 @@ FROM simon987/sist2-build as build MAINTAINER simon987 WORKDIR /build/ -ADD . /build/ +COPY . . RUN cmake -DSIST_PLATFORM=x64_linux -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake . RUN make -j$(nproc) RUN strip sist2 +RUN ls -lh +RUN ls -lh sist2-vue/dist/ FROM ubuntu:20.10