Skip to content

Commit

Permalink
Merge pull request #182 from simon987/dev
Browse files Browse the repository at this point in the history
Fix .dockerignore, add docker build for arm64
  • Loading branch information
simon987 authored Sep 5, 2021
2 parents d0290b8 + 0acdaab commit 97e56b6
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 23 deletions.
48 changes: 26 additions & 22 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -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/
**/ext_libwpd
**/core
*.a
15 changes: 15 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ FROM simon987/sist2-build as build
MAINTAINER simon987 <me@simon987.net>

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

Expand Down

0 comments on commit 97e56b6

Please sign in to comment.