Merge branch 'rocket' of ssh://gitea.b4tman.ru/b4tman/qchgk_web_docker into rocket

# Conflicts: # Dockerfile
add .drone.yml
2023-03-28 17:04:43 +03:00 · 2023-03-28 17:02:37 +03:00 · 2023-03-28 17:01:05 +03:00 · 2023-03-28 16:53:21 +03:00
4 changed files with 18 additions and 3 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,13 @@
+kind: pipeline
+name: default
+
+steps:
+- name: docker  
+  image: plugins/docker
+  settings:
+    registry: gitea.b4tman.ru
+    username: b4tman
+    repo: b4tman/qchgk
+    tags: latest
+    dry_run: true
+
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,3 @@
 [submodule "src"]
 	path = src
-	url = ssh://git@gitea.b4tman.ru:4222/b4tman/qchgk_web.git
+	url = ssh://git@gitea.b4tman.ru/b4tman/qchgk_web.git
--- a/4
+++ b/4
@ -1,4 +1,6 @@
-FROM ekidd/rust-musl-builder:nightly-2021-01-01 as builder
+FROM rust:1-alpine as builder
+
+ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL sparse

 COPY Cargo.toml /home/rust/src/
 COPY Cargo.lock /home/rust/src/
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8231274658bdb631a0ba5a4756d2e9bf5eda9350
+Subproject commit b281f85a70a9a741d1a0851deefcb80e6aa22061
Author	SHA1	Message	Date
Dmitry	f4af0d5e77	Merge branch 'rocket' of ssh://gitea.b4tman.ru/b4tman/qchgk_web_docker into rocket Some checks failed continuous-integration/drone/push Build is failing Details # Conflicts: # Dockerfile	2023-03-28 17:04:43 +03:00
Dmitry	7bd1c14a27	add .drone.yml	2023-03-28 17:02:37 +03:00
Dmitry	8ecb2e073e	builder base image = rust:1-alpine	2023-03-28 17:01:05 +03:00
Dmitry	83f2785481	upd app	2023-03-28 16:53:21 +03:00