Skip to content

Commit 2ce8825

Browse files
Copilotphrocker
andcommitted
Remove version tracking for local builds, use :latest tag
- Modified build-images.sh to use :latest for local builds - Updated deploy-helm.sh to use :latest instead of reading .local.env - Added deprecation notes to .env and .local.env files - Updated .gitignore to properly handle .env backup files - GCP builds still use version tracking via .gcp.env Co-authored-by: phrocker <[email protected]>
1 parent d3ee502 commit 2ce8825

File tree

5 files changed

+96
-32
lines changed

5 files changed

+96
-32
lines changed

.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# DEPRECATED: This file is a legacy reference file.
2+
# For local builds: versions are no longer tracked, :latest is used automatically
3+
# For GCP builds: use .gcp.env instead
14
SENTRIUS_VERSION=1.1.62
25
SENTRIUS_SSH_VERSION=1.1.16
36
SENTRIUS_KEYCLOAK_VERSION=1.1.18

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ package-lock.json
4848

4949
.settings/*
5050
.env.bak
51+
.local.env.bak
52+
.gcp.env.bak
5153
cp.env.bak
5254
.generated.env
5355
api/node_modules/

.local.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# DEPRECATED: This file is no longer used for local builds.
2+
# Local builds now use :latest tag automatically.
3+
# This file is kept for backward compatibility only.
14
SENTRIUS_VERSION=1.1.507
25
SENTRIUS_SSH_VERSION=1.1.45
36
SENTRIUS_KEYCLOAK_VERSION=1.1.60

ops-scripts/base/build-images.sh

Lines changed: 76 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ if [[ "$1" == "local" || "$1" == "gcp" ]]; then
1515
shift
1616
fi
1717

18-
# --- Load and back up environment file ---
19-
ENV_FILE=".$ENV_TARGET.env"
20-
source "$ENV_FILE"
21-
cp "$ENV_FILE" "$ENV_FILE.bak"
18+
# --- Load environment file only for GCP (versions needed for registry) ---
19+
if [[ "$ENV_TARGET" == "gcp" ]]; then
20+
ENV_FILE=".$ENV_TARGET.env"
21+
source "$ENV_FILE"
22+
cp "$ENV_FILE" "$ENV_FILE.bak"
23+
fi
2224

2325
# --- Minikube Docker context ---
2426
if [[ "$ENV_TARGET" == "local" ]]; then
@@ -57,6 +59,11 @@ build_image() {
5759
local version=$2
5860
local context_dir=$3
5961

62+
# For local builds, always use 'latest' tag
63+
if [[ "$ENV_TARGET" == "local" ]]; then
64+
version="latest"
65+
fi
66+
6067
echo "Building $name:$version..."
6168
prepare_docker_context "$context_dir"
6269

@@ -83,7 +90,6 @@ build_image() {
8390
docker push "$REGISTRY/$name:$version"
8491
echo "✅ Pushed $REGISTRY/$name:$version"
8592
else
86-
docker tag "$name:$version" "$name:latest"
8793
echo "✅ Built locally: $name:$version"
8894
fi
8995

@@ -95,6 +101,11 @@ build_keycloak_image() {
95101
local version=$2
96102
local context_dir=$3
97103

104+
# For local builds, always use 'latest' tag
105+
if [[ "$ENV_TARGET" == "local" ]]; then
106+
version="latest"
107+
fi
108+
98109
echo "Building $name:$version..."
99110
prepare_docker_context "$context_dir"
100111

@@ -135,7 +146,6 @@ build_keycloak_image() {
135146
docker push "$REGISTRY/$name:$version"
136147
echo "✅ Pushed $REGISTRY/$name:$version"
137148
else
138-
docker tag "$name:$version" "$name:latest"
139149
echo "✅ Built locally: $name:$version"
140150
fi
141151

@@ -184,38 +194,58 @@ fi
184194
# --- Build Steps ---
185195
if $update_sentrius; then
186196
cp api/target/sentrius-api-*.jar docker/sentrius/sentrius.jar
187-
SENTRIUS_VERSION=$(increment_patch_version $SENTRIUS_VERSION)
197+
if [[ "$ENV_TARGET" == "gcp" ]]; then
198+
SENTRIUS_VERSION=$(increment_patch_version $SENTRIUS_VERSION)
199+
update_env_var "SENTRIUS_VERSION" "$SENTRIUS_VERSION"
200+
else
201+
SENTRIUS_VERSION="latest"
202+
fi
188203
build_image "sentrius" "$SENTRIUS_VERSION" "${SCRIPT_DIR}/../../docker/sentrius/"
189204
rm docker/sentrius/sentrius.jar
190-
update_env_var "SENTRIUS_VERSION" "$SENTRIUS_VERSION"
191205
fi
192206

193207
if $update_sentrius_ssh; then
194-
SENTRIUS_SSH_VERSION=$(increment_patch_version $SENTRIUS_SSH_VERSION)
208+
if [[ "$ENV_TARGET" == "gcp" ]]; then
209+
SENTRIUS_SSH_VERSION=$(increment_patch_version $SENTRIUS_SSH_VERSION)
210+
update_env_var "SENTRIUS_SSH_VERSION" "$SENTRIUS_SSH_VERSION"
211+
else
212+
SENTRIUS_SSH_VERSION="latest"
213+
fi
195214
build_image "sentrius-ssh" "$SENTRIUS_SSH_VERSION" "${SCRIPT_DIR}/../../docker/fake-ssh"
196-
update_env_var "SENTRIUS_SSH_VERSION" "$SENTRIUS_SSH_VERSION"
197215
fi
198216

199217
if $update_sentrius_keycloak; then
200-
SENTRIUS_KEYCLOAK_VERSION=$(increment_patch_version $SENTRIUS_KEYCLOAK_VERSION)
218+
if [[ "$ENV_TARGET" == "gcp" ]]; then
219+
SENTRIUS_KEYCLOAK_VERSION=$(increment_patch_version $SENTRIUS_KEYCLOAK_VERSION)
220+
update_env_var "SENTRIUS_KEYCLOAK_VERSION" "$SENTRIUS_KEYCLOAK_VERSION"
221+
else
222+
SENTRIUS_KEYCLOAK_VERSION="latest"
223+
fi
201224
build_keycloak_image "sentrius-keycloak" "$SENTRIUS_KEYCLOAK_VERSION" "${SCRIPT_DIR}/../../docker/keycloak"
202-
update_env_var "SENTRIUS_KEYCLOAK_VERSION" "$SENTRIUS_KEYCLOAK_VERSION"
203225
fi
204226

205227
if $update_sentrius_agent; then
206228
cp analytics/target/analytics-*.jar docker/sentrius-agent/agent.jar
207-
SENTRIUS_AGENT_VERSION=$(increment_patch_version $SENTRIUS_AGENT_VERSION)
229+
if [[ "$ENV_TARGET" == "gcp" ]]; then
230+
SENTRIUS_AGENT_VERSION=$(increment_patch_version $SENTRIUS_AGENT_VERSION)
231+
update_env_var "SENTRIUS_AGENT_VERSION" "$SENTRIUS_AGENT_VERSION"
232+
else
233+
SENTRIUS_AGENT_VERSION="latest"
234+
fi
208235
build_image "sentrius-agent" "$SENTRIUS_AGENT_VERSION" "${SCRIPT_DIR}/../../docker/sentrius-agent"
209236
rm docker/sentrius-agent/agent.jar
210-
update_env_var "SENTRIUS_AGENT_VERSION" "$SENTRIUS_AGENT_VERSION"
211237
fi
212238

213239
if $update_sentrius_ai_agent; then
214240
cp ai-agent/target/ai-agent-*.jar docker/sentrius-ai-agent/agent.jar
215-
SENTRIUS_AI_AGENT_VERSION=$(increment_patch_version $SENTRIUS_AI_AGENT_VERSION)
241+
if [[ "$ENV_TARGET" == "gcp" ]]; then
242+
SENTRIUS_AI_AGENT_VERSION=$(increment_patch_version $SENTRIUS_AI_AGENT_VERSION)
243+
update_env_var "SENTRIUS_AI_AGENT_VERSION" "$SENTRIUS_AI_AGENT_VERSION"
244+
else
245+
SENTRIUS_AI_AGENT_VERSION="latest"
246+
fi
216247
build_image "sentrius-ai-agent" "$SENTRIUS_AI_AGENT_VERSION" "${SCRIPT_DIR}/../../docker/sentrius-ai-agent"
217248
rm docker/sentrius-ai-agent/agent.jar
218-
update_env_var "SENTRIUS_AI_AGENT_VERSION" "$SENTRIUS_AI_AGENT_VERSION"
219249

220250
cp ai-agent/target/ai-agent-*.jar docker/sentrius-launchable-agent/agent.jar
221251
build_image "sentrius-launchable-agent" "$SENTRIUS_AI_AGENT_VERSION" "${SCRIPT_DIR}/../../docker/sentrius-launchable-agent"
@@ -224,40 +254,60 @@ fi
224254

225255
if $update_integrationproxy; then
226256
cp integration-proxy/target/sentrius-integration-proxy-*.jar docker/integrationproxy/llmproxy.jar
227-
LLMPROXY_VERSION=$(increment_patch_version $LLMPROXY_VERSION)
257+
if [[ "$ENV_TARGET" == "gcp" ]]; then
258+
LLMPROXY_VERSION=$(increment_patch_version $LLMPROXY_VERSION)
259+
update_env_var "LLMPROXY_VERSION" "$LLMPROXY_VERSION"
260+
else
261+
LLMPROXY_VERSION="latest"
262+
fi
228263
build_image "sentrius-integration-proxy" "$LLMPROXY_VERSION" "${SCRIPT_DIR}/../../docker/integrationproxy"
229264
rm docker/integrationproxy/llmproxy.jar
230-
update_env_var "LLMPROXY_VERSION" "$LLMPROXY_VERSION"
231265
fi
232266

233267
if $update_launcher; then
234268
cp agent-launcher/target/agent-launcher-*.jar docker/sentrius-launcher-service/launcher.jar
235-
LAUNCHER_VERSION=$(increment_patch_version $LAUNCHER_VERSION)
269+
if [[ "$ENV_TARGET" == "gcp" ]]; then
270+
LAUNCHER_VERSION=$(increment_patch_version $LAUNCHER_VERSION)
271+
update_env_var "LAUNCHER_VERSION" "$LAUNCHER_VERSION"
272+
else
273+
LAUNCHER_VERSION="latest"
274+
fi
236275
build_image "sentrius-launcher-service" "$LAUNCHER_VERSION" "${SCRIPT_DIR}/../../docker/sentrius-launcher-service"
237276
rm docker/sentrius-launcher-service/launcher.jar
238-
update_env_var "LAUNCHER_VERSION" "$LAUNCHER_VERSION"
239277
fi
240278

241279
if $update_agent_proxy; then
242280
cp agent-proxy/target/sentrius-agent-proxy-*.jar docker/agent-proxy/agentproxy.jar
243-
AGENTPROXY_VERSION=$(increment_patch_version $AGENTPROXY_VERSION)
281+
if [[ "$ENV_TARGET" == "gcp" ]]; then
282+
AGENTPROXY_VERSION=$(increment_patch_version $AGENTPROXY_VERSION)
283+
update_env_var "AGENTPROXY_VERSION" "$AGENTPROXY_VERSION"
284+
else
285+
AGENTPROXY_VERSION="latest"
286+
fi
244287
build_image "sentrius-agent-proxy" "$AGENTPROXY_VERSION" "${SCRIPT_DIR}/../../docker/agent-proxy"
245288
rm docker/agent-proxy/agentproxy.jar
246-
update_env_var "AGENTPROXY_VERSION" "$AGENTPROXY_VERSION"
247289
fi
248290

249291
if $update_ssh_proxy; then
250292
cp ssh-proxy/target/ssh-proxy-*.jar docker/ssh-proxy/sshproxy.jar
251-
SSHPROXY_VERSION=$(increment_patch_version $SSHPROXY_VERSION)
293+
if [[ "$ENV_TARGET" == "gcp" ]]; then
294+
SSHPROXY_VERSION=$(increment_patch_version $SSHPROXY_VERSION)
295+
update_env_var "SSHPROXY_VERSION" "$SSHPROXY_VERSION"
296+
else
297+
SSHPROXY_VERSION="latest"
298+
fi
252299
build_image "sentrius-ssh-proxy" "$SSHPROXY_VERSION" "${SCRIPT_DIR}/../../docker/ssh-proxy"
253300
rm docker/ssh-proxy/sshproxy.jar
254-
update_env_var "SSHPROXY_VERSION" "$SSHPROXY_VERSION"
255301
fi
256302

257303
if $update_rdp_proxy; then
258304
cp rdp-proxy/target/rdp-proxy-*.jar docker/rdp-proxy/rdpproxy.jar
259-
RDPPROXY_VERSION=$(increment_patch_version $RDPPROXY_VERSION)
305+
if [[ "$ENV_TARGET" == "gcp" ]]; then
306+
RDPPROXY_VERSION=$(increment_patch_version $RDPPROXY_VERSION)
307+
update_env_var "RDPPROXY_VERSION" "$RDPPROXY_VERSION"
308+
else
309+
RDPPROXY_VERSION="latest"
310+
fi
260311
build_image "sentrius-rdp-proxy" "$RDPPROXY_VERSION" "${SCRIPT_DIR}/../../docker/rdp-proxy"
261312
rm docker/rdp-proxy/rdpproxy.jar
262-
update_env_var "RDPPROXY_VERSION" "$RDPPROXY_VERSION"
263313
fi

ops-scripts/local/deploy-helm.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,18 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
44

55
source ${SCRIPT_DIR}/base.sh
66
source ${SCRIPT_DIR}/../base/base.sh
7-
source ${SCRIPT_DIR}/../../.local.env
7+
8+
# For local deployments, use 'latest' tag instead of versioned tags
9+
SENTRIUS_VERSION="latest"
10+
SENTRIUS_SSH_VERSION="latest"
11+
SENTRIUS_KEYCLOAK_VERSION="latest"
12+
SENTRIUS_AGENT_VERSION="latest"
13+
SENTRIUS_AI_AGENT_VERSION="latest"
14+
LLMPROXY_VERSION="latest"
15+
LAUNCHER_VERSION="latest"
16+
AGENTPROXY_VERSION="latest"
17+
SSHPROXY_VERSION="latest"
18+
RDPPROXY_VERSION="latest"
819

920
CERT_DIR="${SCRIPT_DIR}/../../docker/dev-certs"
1021
CERT_FILE="${CERT_DIR}/sentrius-ca.crt"
@@ -18,11 +29,6 @@ CERT_DIR="${SCRIPT_DIR}/../../docker/dev-certs"
1829
DEPLOY_ADMINER=${DEPLOY_ADMINER:-false}
1930
ENABLE_RDP_CONTAINER=${ENABLE_RDP_CONTAINER:-false}
2031

21-
# --- Load and back up environment file ---
22-
ENV_FILE="${SCRIPT_DIR}/../../.$ENV_TARGET.env"
23-
source "$ENV_FILE"
24-
cp "$ENV_FILE" "$ENV_FILE.bak"
25-
2632
(source ${SCRIPT_DIR}/../base/generate-secrets.sh)
2733

2834
GENERATED_ENV_PATH="${SCRIPT_DIR}/../../.generated.env"

0 commit comments

Comments
 (0)