Fix .dockerignore, add docker build for arm64

This commit is contained in:
simon987 2021-09-05 11:06:04 -04:00
parent f4e1d90a6b
commit 0acdaab31a
3 changed files with 44 additions and 23 deletions

View File

@ -1,26 +1,30 @@
.idea .idea/
*/thumbs *.sist2
*.cbp docs/
CMakeCache.txt test_i/
CMakeFiles test_i_inc/
cmake-build-debug Testing/
cmake_install.cmake .drone.yml
**/cmake_install.cmake
**/CMakeCache.txt
**/CMakeFiles/
LICENSE
Makefile Makefile
*.out **/*.md
LOG **/*.cbp
sist2* VERSION
index.sist2/ **/node_modules/
bundle*.css
bundle.js
**/*.a
**/vgcore.*
build/
.git/ .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_ffmpeg
**/ext_libmobi **/ext_libmobi
**/scan_a_test **/ext_libwpd
Dockerfile **/core
*.idx/ *.a
VERSION
sist2-vue/node_modules/

View File

@ -71,3 +71,18 @@ steps:
source: source:
- ./sist2-arm64-linux - ./sist2-arm64-linux
- ./sist2-arm64-linux-debug - ./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

View File

@ -2,10 +2,12 @@ FROM simon987/sist2-build as build
MAINTAINER simon987 <me@simon987.net> MAINTAINER simon987 <me@simon987.net>
WORKDIR /build/ 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 cmake -DSIST_PLATFORM=x64_linux -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake .
RUN make -j$(nproc) RUN make -j$(nproc)
RUN strip sist2 RUN strip sist2
RUN ls -lh
RUN ls -lh sist2-vue/dist/
FROM ubuntu:20.10 FROM ubuntu:20.10