stack-service-base 0.0.96 → 0.0.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc8c596dfdf27d84258f0ba68d013ace512f83fba64842e6879720d67a9941bb
-  data.tar.gz: a2ec58f6f4d43c93f3c2e7e6225c4d9b18734d6786852dd86c1f57f0a7cb186e
+  metadata.gz: a29686255562ea2b36806d5d50db270dda9c65d6b9d819f0f9c241a3a4f85049
+  data.tar.gz: 2e33c64c8f927a7ac034c39d2b2ea1b5118bedb3315d44d2265f80d463fafdad
 SHA512:
-  metadata.gz: 0f752b33da42763403b0d193b5ea6543814f1d4de078297dabc29b64517307089b007260147a81ba55598337fa832bb88de17ce156f111d1b1f504a3be4dce7c
-  data.tar.gz: 8ecbdfaca6f1d944f2e232895b5ea929b4698434f7092fa8afcc44a4171bd9458a46a7c4de18fc62f07068edcd8606d0bec1e1627cfc262d1bb0a8241a4617fd
+  metadata.gz: 0f8d15d2b3e8c33e8e321464df2068351da9e6fdb5b0439405635ed7876f4fb014d9525284a87c6237ee13c4731cc177ebfd0f5328f9d44fcc8a32b36f811ff9
+  data.tar.gz: ea9223839e6ccabe433121647be6a8c93ce62d6d807c482aad9c3a1fdf48b18a226a8d7eb1449b71c7ab93e41c4c390f7379d092e6403de8136d0249e3ce4647

data/lib/stack-service-base/env_fetch.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Kernel
+  private
+
+  def ENV! = ENV.method(:fetch)
+end

data/lib/stack-service-base/project_template/home/src/views/layout.slim

@@ -13,3 +13,4 @@ html
         font-family: "Courier New", monospace
   body
     == yield
+    span.version = "v " + (ENV['ORG_OPENCONTAINERS_IMAGE_VERSION'] || '0.0.0')

data/lib/stack-service-base/stack_template/github/.gitattributes

@@ -0,0 +1 @@
+*.drs linguist-language=Ruby

data/lib/stack-service-base/stack_template/github/.github/workflows/deploy.yml

@@ -0,0 +1,50 @@
+on: { push: { branches: [master,main,release,dev] } }
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    env:
+      DEPLOY_SERVER: ${{ secrets.DEPLOY_SERVER }}
+      DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+      DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
+      #  ssh-keygen -t ed25519 -C "github-actions-deploy" -f ~/.ssh/github_actions_deploy -N ""
+      #  cat ~/.ssh/github_actions_deploy.pub >> ~/.ssh/authorized_keys
+      #  chmod 600 ~/.ssh/authorized_keys
+      #  base64 -w 0 ~/.ssh/github_actions_deploy
+      DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends ruby ruby-dev build-essential
+          sudo gem install dry-stack:0.1.54
+
+      - run: |
+          test -n "$DEPLOY_SERVER"
+          test -n "$DEPLOY_KEY"
+          mkdir -p ~/.ssh
+          echo "$DEPLOY_KEY" | base64 -d > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          printf 'Host *\n\tBatchMode yes\n\tStrictHostKeyChecking no\n' > ~/.ssh/config
+          chmod 400 ~/.ssh/config
+
+      - run: |
+          if [ -n "$DOCKER_USERNAME" ] && [ -n "$DOCKER_PASSWORD" ]; then
+            registry="${DOCKER_REGISTRY:-docker.io}"
+            echo "$DOCKER_PASSWORD" | docker login "$registry" -u "$DOCKER_USERNAME" --password-stdin
+          else
+            echo "Skipping Docker registry login; DOCKER_USERNAME or DOCKER_PASSWORD is not set."
+          fi
+
+      - working-directory: stack
+        run: |
+          deploy_target="$DEPLOY_SERVER"
+          if ! printf '%s' "$deploy_target" | grep -q '@'; then
+            deploy_target="${DEPLOY_USER:-root}@${deploy_target}"
+          fi
+
+          dry-stack swarm_deploy -x "ssh://${deploy_target}" -- --prune --resolve-image=always < ruby-mitm-proxy.drs

data/lib/stack-service-base/stack_template/home/stack/Dockerfile.deploy

@@ -1,6 +1,6 @@
 FROM ruby:3.4.4-slim-bookworm AS base
 RUN apt update && apt install -y --no-install-recommends openssh-client ca-certificates
-RUN gem install build-labels:0.0.76 dry-stack:0.1.54
+RUN gem install build-labels:0.0.76 dry-stack:0.1.56
 RUN install-docker-static # 28
 
 WORKDIR /build
@@ -8,6 +8,6 @@ RUN mkdir -p /root/.ssh && mkdir -pv /root/.ssh/sockets
 RUN printf 'Host *\n\tControlPersist yes\n\tControlMaster auto\n\tControlPath  /root/.ssh/sockets/%%r@%%h-%%p\n\tBatchMode yes\n\tStrictHostKeyChecking no\n\tPort 22\n' > /root/.ssh/config
 ADD . .
 
-CMD ["sh", "-c", "\
+CMD ["sh", "-c", "rparallel <<EOF \n\
     cat otlp.drs stack.drs  | dry-stack swarm_deploy --tls-domain=example.com -x ssh://example.com -- --prune \n\
-"]
+EOF\n"]

data/lib/stack-service-base/stack_template/home/stack/stack.drs

@@ -1,3 +1,4 @@
+# vim: set syntax=ruby:
 Options name: 'stack-name'
 
 Service :service_name,  image: 'service_name/master', ports: 7000, ingress: { host: 'service_name.*' }

data/lib/stack-service-base/version.rb

@@ -1,3 +1,3 @@
 module StackServiceBase
-  VERSION = '0.0.96'
+  VERSION = '0.0.97'
 end

data/lib/stack-service-base.rb

@@ -4,6 +4,7 @@ unless defined? RSpec
 end
 
 require 'stack-service-base/version'
+require 'stack-service-base/env_fetch'
 require 'stack-service-base/logging'
 require 'stack-service-base/rack_helpers'
 require 'stack-service-base/open_telemetry'
@@ -98,4 +99,4 @@ module StackServiceBase
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack-service-base
 version: !ruby/object:Gem::Version
-  version: 0.0.96
+  version: 0.0.97
 platform: ruby
 authors:
 - Artyom B
@@ -415,6 +415,7 @@ files:
 - lib/stack-service-base/db_ext/db_proxy.rb
 - lib/stack-service-base/db_ext/geo_ext.rb
 - lib/stack-service-base/debugger.rb
+- lib/stack-service-base/env_fetch.rb
 - lib/stack-service-base/examples/mcp_config.ru
 - lib/stack-service-base/fiber_pool.rb
 - lib/stack-service-base/logging.rb
@@ -456,6 +457,8 @@ files:
 - lib/stack-service-base/safe_exec.rb
 - lib/stack-service-base/sinatra_ext.rb
 - lib/stack-service-base/socket_trace.rb
+- lib/stack-service-base/stack_template/github/.gitattributes
+- lib/stack-service-base/stack_template/github/.github/workflows/deploy.yml
 - lib/stack-service-base/stack_template/gitlab-c/.gitattributes
 - lib/stack-service-base/stack_template/gitlab-c/.gitlab-ci.yml
 - lib/stack-service-base/stack_template/gitlab-c/stack/otlp.drs