Skip to content

Commit f24b816

Browse files
committed
Merge branch 'main' into symfony
2 parents cf84e06 + 98fd751 commit f24b816

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v6
1515
- name: Build image
1616
run: make docker-build
1717
- name: Test image
@@ -39,7 +39,7 @@ jobs:
3939
#- { platform: "linux/mips64", platform-tag: "mips64" }
4040
steps:
4141
- name: Checkout repository
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v6
4343
# https://github.com/docker/setup-qemu-action
4444
- name: Set up QEMU
4545
uses: docker/setup-qemu-action@v3

.github/workflows/publish.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
#- { platform: "linux/mips64", internal-tag: "mips64" }
4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v6
4444
# https://github.com/docker/setup-qemu-action
4545
- name: Set up QEMU
4646
uses: docker/setup-qemu-action@v3
@@ -83,7 +83,7 @@ jobs:
8383
- { docker-hub-tag: "build-version-tag-name" }
8484
steps:
8585
- name: Checkout repository
86-
uses: actions/checkout@v4
86+
uses: actions/checkout@v6
8787
- name: Get the version
8888
run: echo "BUILD_VERSION=$(make version)" >> $GITHUB_ENV
8989
- name: Login to DockerHub
@@ -111,6 +111,17 @@ jobs:
111111
- name: Inspect the manifest
112112
run: docker manifest inspect ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
113113

114+
- name: Sign the manifest
115+
uses: sudo-bot/action-docker-sign@latest
116+
with:
117+
image-ref: "${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}"
118+
private-key-id: "${{ vars.DOCKER_PRIVATE_KEY_ID }}"
119+
private-key-name: "${{ vars.DOCKER_PRIVATE_KEY_NAME }}"
120+
private-key: ${{ secrets.DOCKER_PRIVATE_KEY }}
121+
private-key-passphrase: ${{ secrets.DOCKER_PRIVATE_KEY_PASSPHRASE }}
122+
sign-manifest: true
123+
notary-auth: "${{ secrets.DOCKER_REPOSITORY_LOGIN }}:${{ secrets.DOCKER_REPOSITORY_PASSWORD }}"
124+
114125
tags-cleanup:
115126
environment:
116127
name: Docker Hub

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3-alpine3.21 AS builder
1+
FROM ruby:3-alpine3.23 AS builder
22

33
COPY Gemfile ./
44

@@ -9,7 +9,7 @@ RUN apk add --update --no-cache make ruby-dev gcc musl-dev && \
99
apk del gcc make musl-dev ruby-dev && \
1010
rm -rf /usr/local/bundle/cache /root/.bundle
1111

12-
FROM ruby:3-alpine3.21
12+
FROM ruby:3-alpine3.23
1313

1414
# Metadata params
1515
ARG VCS_REF

docker/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'capistrano', '3.19.2'
3+
gem 'capistrano', '3.20.0'
44
gem 'capistrano-symfony', '~> 2.0.0'
55
# For SSH to work on some machines
66
gem 'ed25519', '~> 1.3'

docker/docker-compose-latest.test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.3"
2-
31
services:
42
sut:
53
build: .

0 commit comments

Comments
 (0)