From d11d4c01fe596ea440a3829016ff63f1da2ca8ef Mon Sep 17 00:00:00 2001
From: Radmir Sadikov <r.sadikov@adguard.com>
Date: Tue, 7 Apr 2026 14:17:59 +0000
Subject: [PATCH] Pull request 191: feat vpn-libs-endpoint: add plan for
 pushing docker image to DockerHub

Squashed commit of the following:

commit a15d7b08a1084a00f5b76cde659c4b7979c76c6a
Author: Radmir Sadikov <r.sadikov@adguard.com>
Date:   Tue Apr 7 12:42:48 2026 +0400

    delete unused 'dependency' block

commit 692e86827b944215434826a502f5f5fd250ac911
Author: Radmir Sadikov <r.sadikov@adguard.com>
Date:   Tue Apr 7 12:28:12 2026 +0400

    feat vpn-libs-endpoint: add plan for pushing docker image to DockerHub
---
 bamboo-specs/bamboo.yaml        |  2 +
 bamboo-specs/deploy-docker.yaml | 67 +++++++++++++++++++++++++++++++++
 bamboo-specs/deploy.yaml        | 16 --------
 3 files changed, 69 insertions(+), 16 deletions(-)
 create mode 100644 bamboo-specs/deploy-docker.yaml

diff --git a/bamboo-specs/bamboo.yaml b/bamboo-specs/bamboo.yaml
index 6be8fa7..240fc9f 100644
--- a/bamboo-specs/bamboo.yaml
+++ b/bamboo-specs/bamboo.yaml
@@ -4,5 +4,7 @@
   !include 'run-tests.yaml'
 ---
   !include 'deploy.yaml'
+---
+  !include 'deploy-docker.yaml'
 ---
   !include 'lint.yaml'
diff --git a/bamboo-specs/deploy-docker.yaml b/bamboo-specs/deploy-docker.yaml
new file mode 100644
index 0000000..51c735b
--- /dev/null
+++ b/bamboo-specs/deploy-docker.yaml
@@ -0,0 +1,67 @@
+---
+version: 2
+triggers: [ ]
+
+plan:
+  project-key: CL
+  key: TTED
+  name: TrustTunnel - Deploy Docker Image
+
+stages:
+  - Build and Push Docker Image:
+      manual: false
+      final: false
+      jobs:
+        - Build and Push Docker Image
+
+Build and Push Docker Image:
+  key: BDI
+  tasks:
+    - checkout:
+        description: Checkout Default Repository
+        force-clean-build: 'true'
+    - script:
+        interpreter: SHELL
+        scripts:
+          - |-
+            #!/bin/bash
+            set -x -e
+
+            VERSION=$(cat endpoint/Cargo.toml | grep "version = " | head -n 1 | sed -e 's/version = "\(.*\)"/\1/')
+            TAG=v${VERSION}
+
+            DOCKER_IMAGE_REPO="trusttunnel/trusttunnel-endpoint"
+            DOCKER_IMAGE_VERSION_TAG="${DOCKER_IMAGE_REPO}:${TAG}"
+            DOCKER_IMAGE_LATEST_TAG="${DOCKER_IMAGE_REPO}:latest"
+
+            set +x
+            echo "${bamboo.trusttunnelDockerHubPassword}" | docker login -u "${bamboo.trusttunnelDockerHubUsername}" --password-stdin
+            set -x
+
+            docker buildx create --name trusttunnel-builder --use || docker buildx use trusttunnel-builder
+            docker buildx build \
+                --target trusttunnel-endpoint \
+                --platform linux/amd64,linux/arm64 \
+                -t "${DOCKER_IMAGE_VERSION_TAG}" \
+                -t "${DOCKER_IMAGE_LATEST_TAG}" \
+                --push .
+  requirements:
+    - adg-privileged-docker
+  artifact-subscriptions: [ ]
+  artifacts: [ ]
+
+repositories:
+  - core-libs/vpn-libs-endpoint:
+      scope: global
+
+branches:
+  create: manually
+  delete: never
+  link-to-jira: true
+
+notifications: [ ]
+
+labels: [ ]
+
+other:
+  concurrent-build-plugin: system-default
diff --git a/bamboo-specs/deploy.yaml b/bamboo-specs/deploy.yaml
index 07ef76b..c752b9b 100644
--- a/bamboo-specs/deploy.yaml
+++ b/bamboo-specs/deploy.yaml
@@ -278,22 +278,6 @@ Deploy artifacts:
             gh release upload ${TAG} ../build_linux/trusttunnel-v${VERSION}-linux-aarch64-dbgsym.tar.gz
             gh release upload ${TAG} ../build_macos/trusttunnel-v${VERSION}-macos-universal.tar.gz
             gh release upload ${TAG} ../build_macos/trusttunnel-v${VERSION}-macos-universal-dbgsym.tar.gz
-
-            DOCKER_IMAGE_REPO="trusttunnel/trusttunnel-endpoint"
-            DOCKER_IMAGE_VERSION_TAG="${DOCKER_IMAGE_REPO}:${TAG}"
-            DOCKER_IMAGE_LATEST_TAG="${DOCKER_IMAGE_REPO}:latest"
-
-            set +x
-            echo "${bamboo.trusttunnelDockerHubPassword}" | docker login -u "${bamboo.trusttunnelDockerHubUsername}" --password-stdin
-            set -x
-
-            docker buildx create --name trusttunnel-builder --use || docker buildx use trusttunnel-builder
-            docker buildx build \
-                --target trusttunnel-endpoint \
-                --platform linux/amd64,linux/arm64 \
-                -t "${DOCKER_IMAGE_VERSION_TAG}" \
-                -t "${DOCKER_IMAGE_LATEST_TAG}" \
-                --push .
   requirements:
     - adg-privileged-docker
   artifact-subscriptions: