Compare commits
12 Commits
9d24c83c5c
...
4f26722592
Author | SHA1 | Date |
---|---|---|
Dmitry Belyaev | 4f26722592 | |
Dmitry Belyaev | a23a36fa5b | |
Dmitry Belyaev | b9762fa150 | |
Dmitry Belyaev | 4c2c957472 | |
Dmitry Belyaev | ebe8970ada | |
Dmitry Belyaev | a6783d673a | |
Dmitry Belyaev | e5c7761dc6 | |
Dmitry Belyaev | 989201bfc8 | |
Dmitry Belyaev | 55c1f5c6f0 | |
Dmitry Belyaev | d01a63a7c0 | |
Dmitry Belyaev | 72682925a0 | |
Dmitry Belyaev | 66cf530a2b |
|
@ -0,0 +1,6 @@
|
|||
target
|
||||
.git
|
||||
.gitignore
|
||||
.drone.yml
|
||||
docker-compose.yml
|
||||
.pre-commit-config.yaml
|
|
@ -0,0 +1,10 @@
|
|||
# See https://pre-commit.com for more information
|
||||
# See https://pre-commit.com/hooks.html for more hooks
|
||||
repos:
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v3.2.0
|
||||
hooks:
|
||||
- id: trailing-whitespace
|
||||
- id: end-of-file-fixer
|
||||
- id: check-yaml
|
||||
- id: check-added-large-files
|
35
Dockerfile
35
Dockerfile
|
@ -1,25 +1,34 @@
|
|||
FROM rustlang/rust:nightly-alpine as builder
|
||||
FROM rust:1-alpine as chef
|
||||
|
||||
ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL sparse
|
||||
|
||||
RUN apk add --no-cache musl-dev
|
||||
RUN apk add --no-cache musl-dev curl
|
||||
|
||||
# install cargo-binstall
|
||||
RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh -o install-from-binstall-release.sh
|
||||
RUN sh install-from-binstall-release.sh
|
||||
|
||||
# install cargo-chef
|
||||
RUN cargo binstall -y cargo-chef
|
||||
|
||||
WORKDIR /home/rust/src
|
||||
|
||||
COPY Cargo.toml /home/rust/src/
|
||||
COPY Cargo.lock /home/rust/src/
|
||||
RUN mkdir /home/rust/src/src && \
|
||||
echo 'fn main() {}' > /home/rust/src/src/main.rs
|
||||
FROM chef AS planner
|
||||
|
||||
RUN cargo fetch
|
||||
COPY . .
|
||||
|
||||
RUN cargo chef prepare --recipe-path recipe.json
|
||||
|
||||
FROM chef as builder
|
||||
COPY --from=planner /home/rust/src/recipe.json recipe.json
|
||||
|
||||
# build & cache deps
|
||||
RUN cargo chef cook --release --recipe-path recipe.json
|
||||
|
||||
# build app with cached deps
|
||||
COPY . .
|
||||
RUN cargo build --release
|
||||
|
||||
RUN rm -f /home/rust/src/src/main.rs
|
||||
COPY src /home/rust/src/src
|
||||
RUN touch /home/rust/src/src/main.rs
|
||||
|
||||
RUN cargo build -v --release
|
||||
|
||||
FROM scratch
|
||||
|
||||
COPY static /static
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
version: '2'
|
||||
services:
|
||||
qchgk:
|
||||
build:
|
||||
context: src
|
||||
dockerfile: ../Dockerfile
|
||||
image: 'b4tman/qchgk:rocket'
|
||||
#build:
|
||||
# context: src
|
||||
# dockerfile: ../Dockerfile
|
||||
image: 'gitea.b4tman.ru/b4tman/qchgk:latest'
|
||||
container_name: 'qchgk'
|
||||
ports:
|
||||
- '8088:8088'
|
||||
|
@ -19,4 +19,4 @@ services:
|
|||
# RUST_BACKTRACE: 1
|
||||
# RUST_BACKTRACE: full
|
||||
volumes:
|
||||
- '/data/lab/docker/qchgk_web/db:/db/:ro'
|
||||
- './db.dat:/db.dat:ro'
|
||||
|
|
2
src
2
src
|
@ -1 +1 @@
|
|||
Subproject commit d1cb2187c1a74b394df651cb244cbf93982493cb
|
||||
Subproject commit da962a9f7ae7e398f52fcc85518879dadfef8b79
|
Loading…
Reference in New Issue