Переход с тестовой версии на основную ветку
This commit is contained in:
+2
-2
@@ -3,9 +3,9 @@ stages:
|
|||||||
|
|
||||||
build-images:
|
build-images:
|
||||||
stage: build
|
stage: build
|
||||||
image: repo.nstart.local/nstart/docker-cli-buildx:1.0.0
|
image: repo.nstart.cloud/nstart/docker-cli-buildx:1.0.0
|
||||||
services:
|
services:
|
||||||
- name: repo.nstart.local/nstart/docker-dind-ca:1.0.0
|
- name: repo.nstart.cloud/library/docker:29.1.2-dind
|
||||||
alias: docker
|
alias: docker
|
||||||
command: ["--tls=false"]
|
command: ["--tls=false"]
|
||||||
variables:
|
variables:
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ Argon2id-PHC.
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
docker run --rm -ti \
|
docker run --rm -ti \
|
||||||
nstart/vaultwarden-server:1.0.1 \
|
nstart/vaultwarden-server:1.0.2 \
|
||||||
/vaultwarden hash --preset owasp \
|
/vaultwarden hash --preset owasp \
|
||||||
| tee >(grep 'ADMIN_TOKEN=' > secrets/vw_admin_token.txt)
|
| tee >(grep 'ADMIN_TOKEN=' > secrets/vw_admin_token.txt)
|
||||||
```
|
```
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
ARG BASE_REPO="repo.nstart.local/"
|
ARG BASE_REPO="repo.nstart.cloud/"
|
||||||
FROM ${BASE_REPO}library/alpine:3.22.1
|
FROM ${BASE_REPO}library/alpine:3.22.1
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="VaultWarden backup" \
|
LABEL org.opencontainers.image.title="VaultWarden backup" \
|
||||||
|
|||||||
+3
-3
@@ -1,13 +1,13 @@
|
|||||||
variable "registry" {
|
variable "registry" {
|
||||||
default = "repo.nstart.local"
|
default = "repo.nstart.cloud"
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "base_repo" {
|
variable "base_repo" {
|
||||||
default = "repo.nstart.local/"
|
default = "repo.nstart.cloud/"
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "VERSION" {
|
variable "VERSION" {
|
||||||
default = "1.0.1"
|
default = "1.0.2"
|
||||||
}
|
}
|
||||||
|
|
||||||
function "oci_labels" {
|
function "oci_labels" {
|
||||||
|
|||||||
+3
-3
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
vaultwarden:
|
vaultwarden:
|
||||||
image: repo.nstart.local/nstart/vaultwarden-server:1.0.1
|
image: repo.nstart.cloud/nstart/vaultwarden-server:1.0.2
|
||||||
container_name: vaultwarden-server
|
container_name: vaultwarden-server
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
env_file:
|
env_file:
|
||||||
@@ -12,7 +12,7 @@ services:
|
|||||||
- vaultwarden
|
- vaultwarden
|
||||||
|
|
||||||
proxy:
|
proxy:
|
||||||
image: repo.nstart.local/nstart/vaultwarden-proxy:1.0.1
|
image: repo.nstart.cloud/nstart/vaultwarden-proxy:1.0.2
|
||||||
container_name: vaultwarden-proxy
|
container_name: vaultwarden-proxy
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -24,7 +24,7 @@ services:
|
|||||||
- vaultwarden
|
- vaultwarden
|
||||||
|
|
||||||
backup:
|
backup:
|
||||||
image: repo.nstart.local/nstart/vaultwarden-backup:1.0.1
|
image: repo.nstart.cloud/nstart/vaultwarden-backup:1.0.2
|
||||||
container_name: vaultwarden-backup
|
container_name: vaultwarden-backup
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
ARG BASE_REPO="repo.nstart.local/"
|
ARG BASE_REPO="repo.nstart.cloud/"
|
||||||
FROM ${BASE_REPO}library/nginx:1.29.1-alpine
|
FROM ${BASE_REPO}library/nginx:1.29.1-alpine
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="VaultWarden proxy" \
|
LABEL org.opencontainers.image.title="VaultWarden proxy" \
|
||||||
|
|||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
ARG BASE_REPO="repo.nstart.local/"
|
ARG BASE_REPO="repo.nstart.cloud/"
|
||||||
FROM ${BASE_REPO}vaultwarden/server:testing-alpine
|
FROM ${BASE_REPO}vaultwarden/server:1.35.8
|
||||||
|
|
||||||
LABEL org.opencontainers.image.title="VaultWarden server" \
|
LABEL org.opencontainers.image.title="VaultWarden server" \
|
||||||
org.opencontainers.image.description="NStart VaultWarden server."
|
org.opencontainers.image.description="NStart VaultWarden server."
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"domain": "https://vaultwarden.nstart.local",
|
"domain": "https://vaultwarden.nstart.cloud",
|
||||||
"sends_allowed": true,
|
"sends_allowed": true,
|
||||||
"incomplete_2fa_time_limit": 3,
|
"incomplete_2fa_time_limit": 3,
|
||||||
"disable_icon_download": true,
|
"disable_icon_download": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user