Compare commits

..

No commits in common. "233d21ecd7c62c75c8119bb36ad712c6688c3f65" and "fa8c1e73d124d94eaeff3864fe365f62e7236d21" have entirely different histories.

3 changed files with 8 additions and 22 deletions

1
.dockerignore Normal file
View File

@ -0,0 +1 @@
version.h

View File

@ -1,5 +1,4 @@
# build FROM debian:latest
FROM debian:latest as build
WORKDIR /usr/src/app WORKDIR /usr/src/app
@ -9,24 +8,14 @@ clang \
make \ make \
libsqlite3-dev libsqlite3-dev
COPY src ./src COPY . ./
COPY vendor ./vendor
COPY .git ./.git
COPY Makefile CMakeLists.txt version.h.in ./
RUN make -j8 RUN make -j8
# prod # tabledata should be copied from the host;
FROM debian:latest # clone it there before building the container
#RUN git submodule update --init --recursive
WORKDIR /usr/src/app CMD ["./bin/fusion"]
RUN apt-get -y update && apt-get install -y \ LABEL Name=openfusion Version=0.0.1
libsqlite3-dev
COPY --from=build /usr/src/app/bin/fusion /bin/fusion
COPY sql ./sql
CMD ["/bin/fusion"]
LABEL Name=openfusion Version=0.0.2

View File

@ -6,10 +6,6 @@ services:
build: build:
context: . context: .
dockerfile: ./Dockerfile dockerfile: ./Dockerfile
volumes:
- ./config.ini:/usr/src/app/config.ini
- ./database.db:/usr/src/app/database.db
- ./tdata:/usr/src/app/tdata
ports: ports:
- "23000:23000" - "23000:23000"
- "23001:23001" - "23001:23001"