58 lines
2.4 KiB
Plaintext
58 lines
2.4 KiB
Plaintext
refactor(CI): adicionado imagem para automacao
|
|
# Please enter the commit message for your changes. Lines starting
|
|
# with '#' will be ignored, and an empty message aborts the commit.
|
|
#
|
|
# Committer: Antonio Lopes dos Santos <antonio.santos@labv2.rkm.local>
|
|
#
|
|
# On branch feat_CI_CD_TEST
|
|
# Your branch is up to date with 'origin/feat_CI_CD_TEST'.
|
|
#
|
|
# Changes to be committed:
|
|
# modified: Dockerfile
|
|
# modified: docker/deploy/deploy-over-ssh.sh
|
|
#
|
|
# Changes not staged for commit:
|
|
# modified: docker/README.md
|
|
#
|
|
# Untracked files:
|
|
# docker/base-image/
|
|
#
|
|
# ------------------------ >8 ------------------------
|
|
# Do not modify or remove the line above.
|
|
# Everything below it will be ignored.
|
|
diff --git a/Dockerfile b/Dockerfile
|
|
index 970557138..76155d54c 100644
|
|
--- a/Dockerfile
|
|
+++ b/Dockerfile
|
|
@@ -1,4 +1,4 @@
|
|
-ARG BASE_IMAGE=tirkm/v2-application:6
|
|
+ARG BASE_IMAGE=tirkm/v1-automation-ci
|
|
# Node 10 / npm 6 — o mesmo toolchain com que este projeto (vue 2.6 /
|
|
# @vue/cli-service 4.5) e construido hoje. Subir de versao aqui e uma mudanca
|
|
# a parte: muda o bundle gerado, e merece ser validada por si.
|
|
diff --git a/docker/deploy/deploy-over-ssh.sh b/docker/deploy/deploy-over-ssh.sh
|
|
index f36f5c371..3595dc226 100755
|
|
--- a/docker/deploy/deploy-over-ssh.sh
|
|
+++ b/docker/deploy/deploy-over-ssh.sh
|
|
@@ -16,11 +16,7 @@ SSH_HOST="${SSH_HOST:-}"
|
|
SSH_PORT="${SSH_PORT:-22}"
|
|
SSH_USER="${SSH_USER:-}"
|
|
SSH_PRIVATE_KEY="${SSH_PRIVATE_KEY:-}"
|
|
-# Chave publica do host de teste .44 (labv2), conferida em 03/08/2026.
|
|
-# Um Secret SSH_KNOWN_HOSTS, quando existir, tem precedencia para permitir
|
|
-# rotacao sem alterar codigo. Essa chave nao e credencial secreta.
|
|
-DEFAULT_SSH_KNOWN_HOSTS='192.168.0.44 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBX7P17mrbGVhY7fJTuR4iLVVcIRZH+/nhJEfBbHVdaK'
|
|
-SSH_KNOWN_HOSTS="${SSH_KNOWN_HOSTS:-${DEFAULT_SSH_KNOWN_HOSTS}}"
|
|
+SSH_KNOWN_HOSTS="${SSH_KNOWN_HOSTS:-}"
|
|
REGISTRY="${REGISTRY:-192.168.0.41:3001}"
|
|
REGISTRY_TOKEN="${REGISTRY_TOKEN:-}"
|
|
REGISTRY_USER="${REGISTRY_USER:-${ACTOR:-}}"
|
|
@@ -37,6 +33,7 @@ fail() { echo "[deploy-ssh][ERRO] $*" >&2; exit 1; }
|
|
[ -n "${SSH_HOST}" ] || fail "SSH_HOST nao definido"
|
|
[ -n "${SSH_USER}" ] || fail "SSH_USER nao definido"
|
|
[ -n "${SSH_PRIVATE_KEY}" ] || fail "SSH_PRIVATE_KEY nao definido"
|
|
+[ -n "${SSH_KNOWN_HOSTS}" ] || fail "SSH_KNOWN_HOSTS nao definido"
|
|
[ -n "${REGISTRY_TOKEN}" ] || fail "REGISTRY_TOKEN nao definido"
|
|
[ -n "${REGISTRY_USER}" ] || fail "REGISTRY_USER/ACTOR nao definido"
|
|
|