stack-service-base 0.0.105 → 0.0.106

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/stack-service-base/frontend_template/github/.github/workflows/main.yml +12 -6
  3. data/lib/stack-service-base/frontend_template/gitlab/docker/Dockerfile.build +17 -30
  4. data/lib/stack-service-base/frontend_template/gitlab-c/docker/Dockerfile.build +17 -11
  5. data/lib/stack-service-base/project_template/github/.github/workflows/main.yml +12 -6
  6. data/lib/stack-service-base/version.rb +1 -1
  7. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 06ae719b529bdc2937204a4dc72cd391fdbb77a62f7308c17af01e282a376cda
4
- data.tar.gz: 06ba7b4c00ed0ef9e2b4e1f0ed3adf011c5800e523b78983b5fd6a8ccab23f5a
3
+ metadata.gz: 41c8daa1af0b515beb2aea9e653982b05d14c32f26a656951dd346c6c3b46c34
4
+ data.tar.gz: 35d0ea4dd35664a47e4c985153ebb6591e972778f10abc77cd4f8ca027f3eb95
5
5
  SHA512:
6
- metadata.gz: e47c35b7c3866b1601a4ffc5a76efd83c65043e5a4fc83b637b505ced2f9e9f5941c9485d455564246d35d9f3396ad2fbc5ecb246f4b5214904d576f783743e9
7
- data.tar.gz: 238432ac55ce910326b4905a2db84b4e3dc90ffae530be2ac27aa7906442db59a056f295b80b6d8af3d07a67b78803fd571c2ca5edfb2eb778dd09e97daa2a2f
6
+ metadata.gz: b140be7b06075d16a2b4d6cf82ef4c2f4ca8d11ba6e28aa036e3037169e7c00c4d062dc4279c664ae3c94d54b8f150f3e23994b8330592eb343492868118356e
7
+ data.tar.gz: a52db24f9ea079bb868c5a0e8dc70a23243ffcb69c3fce513d7821749fe0ac6ad8332c9cb7d298cf44c0f1b199520c24306878be11250227cf1f00dc88cb80d4
data/lib/stack-service-base/frontend_template/github/.github/workflows/main.yml CHANGED
@@ -3,17 +3,23 @@ on: { push: { branches: [main,release] } }
3
3
  jobs:
4
4
  build_service_images:
5
5
  runs-on: ubuntu-latest
6
+ env:
7
+ BUILDX_BAKE_ENTITLEMENTS_FS: '0'
8
+ REGISTRY_HOST: '${{ secrets.DOCKER_HUB_LOGIN }}'
6
9
  steps:
7
10
  - uses: actions/checkout@v3
8
11
  - uses: docker/login-action@v2
9
12
  with: { username: '${{ secrets.DOCKER_HUB_LOGIN }}', password: '${{ secrets.DOCKER_HUB_PASSWORD }}' }
10
13
  - uses: docker/setup-buildx-action@v3
11
14
  - uses: ruby/setup-ruby@v1
12
- with: { ruby-version: 3.4.4 }
13
- - run: gem install build-labels
14
- - run: env && cd docker && build-labels -n -c docker-compose.yml $(if [ "${GITHUB_REF##*/}" = "release" ]; then echo "--full-version"; fi) github set_version to_dockerfiles to_compose | tee bake.yml
15
+ with: { ruby-version: 3.4.10 }
16
+ - run: gem install build-labels:0.0.84
17
+ - run: cd docker && build-labels -n -c docker-compose.yml $(if [ "${GITHUB_REF##*/}" = "release" ]; then echo "--full-version"; fi) github set_version to_dockerfiles to_compose | tee bake.yml
15
18
  env:
16
19
  GITHUB_RUN_NUMBER: ${{ github.run_number }}
17
- - uses: docker/bake-action@v5
18
- env: { REGISTRY_HOST: '${{ secrets.DOCKER_HUB_LOGIN }}' }
19
- with: { workdir: ./docker, files: bake.yml, push: true }
20
+ - run: docker buildx bake -f bake.yml --set '*.output=type=docker' --sbom=false --provenance=false --metadata-file /tmp/bake-metadata.json
21
+ working-directory: docker
22
+ - run: trivy-runner -f bake.yml --metadata-file /tmp/bake-metadata.json -- --severity HIGH,CRITICAL --ignore-unfixed --table-mode detailed
23
+ working-directory: docker
24
+ - run: docker compose -f bake.yml push
25
+ working-directory: docker
data/lib/stack-service-base/frontend_template/gitlab/docker/Dockerfile.build CHANGED
@@ -1,36 +1,23 @@
1
- FROM ruby:3.4.4-slim-bookworm AS base
2
- RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates curl git tar \
3
- && rm -rf /var/lib/apt/lists/*
4
- RUN gem install build-labels:0.0.79
5
- RUN BUILDX_VERSION=v0.20.1 COMPOSE_VERSION=v2.33.0 install-docker-static 27.5.1
1
+ FROM ruby:3.4.10-slim-bookworm AS base
2
+ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends bash git jq ca-certificates curl tar
3
+ RUN gem install build-labels:0.0.84
4
+ RUN install-docker-static
6
5
 
7
6
  WORKDIR /build
7
+ COPY . .
8
8
 
9
- COPY .. .
10
-
11
- CMD ["bash", "-euo", "pipefail", "-c", "\
9
+ CMD ["bash", "-e", "-o", "pipefail", "-c", "\
12
10
  cd /build/docker; \
13
- if [ -n \"${CI_REGISTRY:-}\" ] && [ -n \"${CI_REGISTRY_USER:-}\" ] && [ -n \"${CI_REGISTRY_PASSWORD:-}\" ]; then \
14
- echo \"$CI_REGISTRY_PASSWORD\" | docker login \"$CI_REGISTRY\" -u \"$CI_REGISTRY_USER\" --password-stdin; \
15
- fi; \
16
- build-labels -n -c docker-compose.yml changed gitlab set_version cache to_dockerfiles to_compose | tee bake.yml; \
17
- export OTEL_RESOURCE_ATTRIBUTES=\"service.name=docker-builder,pipeline.id=${CI_PIPELINE_ID:-local},project.name=${service_name}\"; \
18
- export REGISTRY_HOST=\"${REGISTRY_HOST:-${CI_REGISTRY_HOST:-${CI_REGISTRY_IMAGE:-}}}\"; \
19
- : \"${REGISTRY_HOST:?REGISTRY_HOST, CI_REGISTRY_IMAGE, or CI_REGISTRY_HOST is required}\"; \
20
- export BUILDX_BAKE_ENTITLEMENTS_FS=0; \
21
- if grep -q \"services: {}\" bake.yml; then \
22
- echo \"No changed services to build.\"; \
23
- exit 0; \
24
- fi; \
25
- docker buildx create --name \"${service_name}-builder\" --driver docker-container --use || docker buildx use \"${service_name}-builder\"; \
26
- docker buildx inspect --bootstrap; \
27
- if [ -n \"${CI_SKIP_PUSH:-}\" ]; then \
28
- docker buildx bake --load --allow=fs.read=../src -f bake.yml; \
29
- else \
30
- docker buildx bake --push --allow=fs.read=../src -f bake.yml; \
11
+ build-labels -n -c docker-compose.yml changed gitlab set_version to_dockerfiles to_compose | tee bake.yml; \
12
+ export OTEL_RESOURCE_ATTRIBUTES=\"service.name=docker-builder,pipeline.id=${CI_PIPELINE_ID:-},project.name=${CI_PROJECT_NAME:-}\"; \
13
+ export REGISTRY_HOST=\"${CI_REGISTRY_HOST:-}\" BUILDX_BAKE_ENTITLEMENTS_FS=0; \
14
+ grep -q '^services: {}$' bake.yml && exit 0; \
15
+ docker buildx bake -f bake.yml --set '*.output=type=docker' --sbom=false --provenance=false --metadata-file /tmp/bake-metadata.json; \
16
+ if [ \"${CI_BUILD_TARGET:-}\" = tests ]; then \
17
+ docker compose -f bake.yml down --remove-orphans; \
18
+ docker compose -f bake.yml up --force-recreate --no-build --pull never --abort-on-container-failure; \
31
19
  fi; \
32
- if [ \"${CI_BUILD_TARGET:-}\" = \"tests\" ]; then \
33
- docker compose -f bake.yml down --remove-orphans; \
34
- docker compose -f bake.yml up --no-build --force-recreate --abort-on-container-failure; \
35
- fi \
20
+ trivy-runner -f bake.yml --metadata-file /tmp/bake-metadata.json -- --severity HIGH,CRITICAL --ignore-unfixed --table-mode detailed; \
21
+ [ -z \"${CI_SKIP_PUSH:-}\" ] || exit 0; \
22
+ docker compose -f bake.yml push;\
36
23
  "]
data/lib/stack-service-base/frontend_template/gitlab-c/docker/Dockerfile.build CHANGED
@@ -1,17 +1,23 @@
1
- FROM ruby:3.4.4-slim-bookworm AS base
2
- RUN apt update && apt install -y --no-install-recommends bash git
3
- RUN gem install build-labels:0.0.79
1
+ FROM ruby:3.4.10-slim-bookworm AS base
2
+ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends bash git jq ca-certificates curl tar
3
+ RUN gem install build-labels:0.0.84
4
4
  RUN install-docker-static
5
5
 
6
6
  WORKDIR /build
7
-
8
7
  COPY . .
9
8
 
10
- CMD ["bash", "-c", "-x", "\
11
- env && cd /build/docker && \
12
- build-labels -n -c docker-compose.yml changed gitlab set_version to_dockerfiles to_compose | tee bake.yml && \
13
- export OTEL_RESOURCE_ATTRIBUTES=service.name=docker-builder,pipeline.id=${CI_PIPELINE_ID},project.name=${CI_PROJECT_NAME} && \
14
- export REGISTRY_HOST=$CI_REGISTRY_HOST && export BUILDX_BAKE_ENTITLEMENTS_FS=0 && \
15
- (grep \"services: {}\" bake.yml || (docker buildx bake -f bake.yml $([ -z \"$CI_SKIP_PUSH\" ] && echo \"--push\") && \
16
- ([ \"$CI_BUILD_TARGET\" != \"tests\" ] || (docker compose -f bake.yml down && docker compose -f bake.yml up --force-recreate --abort-on-container-failure )))) \
9
+ CMD ["bash", "-e", "-o", "pipefail", "-c", "\
10
+ cd /build/docker; \
11
+ build-labels -n -c docker-compose.yml changed gitlab set_version to_dockerfiles to_compose | tee bake.yml; \
12
+ export OTEL_RESOURCE_ATTRIBUTES=\"service.name=docker-builder,pipeline.id=${CI_PIPELINE_ID:-},project.name=${CI_PROJECT_NAME:-}\"; \
13
+ export REGISTRY_HOST=\"${CI_REGISTRY_HOST:-}\" BUILDX_BAKE_ENTITLEMENTS_FS=0; \
14
+ grep -q '^services: {}$' bake.yml && exit 0; \
15
+ docker buildx bake -f bake.yml --set '*.output=type=docker' --sbom=false --provenance=false --metadata-file /tmp/bake-metadata.json; \
16
+ if [ \"${CI_BUILD_TARGET:-}\" = tests ]; then \
17
+ docker compose -f bake.yml down --remove-orphans; \
18
+ docker compose -f bake.yml up --force-recreate --no-build --pull never --abort-on-container-failure; \
19
+ fi; \
20
+ trivy-runner -f bake.yml --metadata-file /tmp/bake-metadata.json -- --severity HIGH,CRITICAL --ignore-unfixed --table-mode detailed; \
21
+ [ -z \"${CI_SKIP_PUSH:-}\" ] || exit 0; \
22
+ docker compose -f bake.yml push;\
17
23
  "]
data/lib/stack-service-base/project_template/github/.github/workflows/main.yml CHANGED
@@ -3,17 +3,23 @@ on: { push: { branches: [main,release] } }
3
3
  jobs:
4
4
  build_service_images:
5
5
  runs-on: ubuntu-latest
6
+ env:
7
+ BUILDX_BAKE_ENTITLEMENTS_FS: '0'
8
+ REGISTRY_HOST: '${{ secrets.DOCKER_HUB_LOGIN }}'
6
9
  steps:
7
10
  - uses: actions/checkout@v3
8
11
  - uses: docker/login-action@v2
9
12
  with: { username: '${{ secrets.DOCKER_HUB_LOGIN }}', password: '${{ secrets.DOCKER_HUB_PASSWORD }}' }
10
13
  - uses: docker/setup-buildx-action@v3
11
14
  - uses: ruby/setup-ruby@v1
12
- with: { ruby-version: 3.4.4 }
13
- - run: gem install build-labels
14
- - run: env && cd docker && build-labels -n -c docker-compose.yml $(if [ "${GITHUB_REF##*/}" = "release" ]; then echo "--full-version"; fi) github set_version to_dockerfiles to_compose | tee bake.yml
15
+ with: { ruby-version: 3.4.10 }
16
+ - run: gem install build-labels:0.0.84
17
+ - run: cd docker && build-labels -n -c docker-compose.yml $(if [ "${GITHUB_REF##*/}" = "release" ]; then echo "--full-version"; fi) github set_version to_dockerfiles to_compose | tee bake.yml
15
18
  env:
16
19
  GITHUB_RUN_NUMBER: ${{ github.run_number }}
17
- - uses: docker/bake-action@v5
18
- env: { REGISTRY_HOST: '${{ secrets.DOCKER_HUB_LOGIN }}' }
19
- with: { workdir: ./docker, files: bake.yml, push: true }
20
+ - run: docker buildx bake -f bake.yml --set '*.output=type=docker' --sbom=false --provenance=false --metadata-file /tmp/bake-metadata.json
21
+ working-directory: docker
22
+ - run: trivy-runner -f bake.yml --metadata-file /tmp/bake-metadata.json -- --severity HIGH,CRITICAL --ignore-unfixed --table-mode detailed
23
+ working-directory: docker
24
+ - run: docker compose -f bake.yml push
25
+ working-directory: docker
data/lib/stack-service-base/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module StackServiceBase
2
- VERSION = '0.0.105'
2
+ VERSION = '0.0.106'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: stack-service-base
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.105
4
+ version: 0.0.106
5
5
  platform: ruby
6
6
  authors:
7
7
  - Artyom B