Compare commits
No commits in common. "2a59dbebf8484b2d323edc0202e2346303e939aa" and "0cb22fb210dd40bedaf2ac3db5123ce3bcd0243f" have entirely different histories.
2a59dbebf8
...
0cb22fb210
|
@ -1,20 +1,20 @@
|
|||
stages:
|
||||
- test
|
||||
# - test
|
||||
- ui
|
||||
- build
|
||||
- deploy
|
||||
- release
|
||||
|
||||
|
||||
test:
|
||||
image: "rust:slim-buster"
|
||||
stage: test
|
||||
script:
|
||||
- mkdir dist
|
||||
- touch dist/index.html
|
||||
- apt-get update
|
||||
- apt-get -y install pkg-config
|
||||
- cargo test
|
||||
# test:
|
||||
# image: "rust:slim-buster"
|
||||
# stage: test
|
||||
# script:
|
||||
# - mkdir dist
|
||||
# - touch dist/index.html
|
||||
# - apt-get update
|
||||
# - apt-get -y install pkg-config
|
||||
# - cargo test
|
||||
|
||||
build-ui:
|
||||
stage: ui
|
||||
|
@ -24,8 +24,8 @@ build-ui:
|
|||
- apt-get -y install libssl-dev
|
||||
- npm install
|
||||
- npm run build
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
# rules:
|
||||
# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
artifacts:
|
||||
paths:
|
||||
- dist/
|
||||
|
@ -57,8 +57,6 @@ build-musl-bin:
|
|||
- build-ui
|
||||
stage: build
|
||||
image: 'rust:latest'
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
script:
|
||||
- rustup target add x86_64-unknown-linux-musl
|
||||
- apt update && apt install -y musl-tools musl-dev
|
||||
|
@ -90,7 +88,6 @@ build-arm-bin:
|
|||
artifacts:
|
||||
paths:
|
||||
- target/armv7-unknown-linux-gnueabihf/release/vade
|
||||
- vade-linux-arm.tar.gz
|
||||
|
||||
|
||||
build-win-bin:
|
||||
|
@ -116,8 +113,8 @@ deploy-dev-docker:
|
|||
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
|
||||
- docker build -t $CI_REGISTRY/vade/vade-mecum .
|
||||
- docker push $CI_REGISTRY/vade/vade-mecum
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
# rules:
|
||||
# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
|
||||
deploy-binaries:
|
||||
dependencies:
|
||||
|
@ -131,8 +128,11 @@ deploy-binaries:
|
|||
- if: $CI_COMMIT_TAG
|
||||
script:
|
||||
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ./vade-linux-x64.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/bin/$CI_COMMIT_TAG/vade-linux-x64-$CI_COMMIT_TAG.tar.gz"'
|
||||
|
||||
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ./vade-linux-arm.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/bin/$CI_COMMIT_TAG/vade-linux-arm-$CI_COMMIT_TAG.tar.gz"'
|
||||
|
||||
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ./vade-linux-musl.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/bin/$CI_COMMIT_TAG/vade-linux-musl-$CI_COMMIT_TAG.tar.gz"'
|
||||
|
||||
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ./target/release/vade.exe "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/bin/$CI_COMMIT_TAG/vade.exe"'
|
||||
|
||||
release:
|
||||
|
|
|
@ -3,4 +3,5 @@ COPY target/x86_64-unknown-linux-musl/release/vade /app/vade
|
|||
EXPOSE 8080
|
||||
WORKDIR app
|
||||
RUN touch data.db
|
||||
RUN ls -lh
|
||||
CMD ["./vade"]
|
||||
|
|
|
@ -41,7 +41,7 @@ async fn main() {
|
|||
.service(api::routes())
|
||||
.service(dist)
|
||||
})
|
||||
.bind("0.0.0.0:8080")
|
||||
.bind("127.0.0.1:8080")
|
||||
.unwrap()
|
||||
.run()
|
||||
.await
|
||||
|
|
Loading…
Reference in New Issue