Skip to content

Commit 7e68ca8

Browse files
committed
fix: hard pin reusable workflow + dagger module versions
1 parent f9460b4 commit 7e68ca8

3 files changed

Lines changed: 13 additions & 8 deletions

File tree

.dagger/main.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,28 @@ import (
1010

1111
const (
1212
nodeJSVersion = "16"
13-
repoName = "macroservices"
1413
)
1514

1615
type MacroservicesInvoiceRenderer struct {
16+
// Repository name
17+
// +private
18+
RepoName string
1719
// Source code directory
1820
Source *dagger.Directory
1921
// +private
2022
InfisicalClientSecret *dagger.Secret
2123
}
2224

2325
func New(
26+
repoName string,
2427
// Source code directory
2528
// +defaultPath="."
2629
source *dagger.Directory,
2730
// Infisical client secret
2831
infisicalClientSecret *dagger.Secret,
2932
) *MacroservicesInvoiceRenderer {
3033
return &MacroservicesInvoiceRenderer{
34+
RepoName: repoName,
3135
Source: source,
3236
InfisicalClientSecret: infisicalClientSecret,
3337
}
@@ -80,15 +84,15 @@ func (m *MacroservicesInvoiceRenderer) BuildAndPush(
8084
g, ctx := errgroup.WithContext(ctx)
8185

8286
g.Go(func() error {
83-
_, err := dag.Docker(m.Source.Directory("backend"), m.InfisicalClientSecret, repoName+"-backend", dagger.DockerOpts{
87+
_, err := dag.Docker(m.Source.Directory("backend"), m.InfisicalClientSecret, m.RepoName+"-backend", dagger.DockerOpts{
8488
Environment: env,
8589
}).Build().Publish(ctx)
8690

8791
return err
8892
})
8993

9094
g.Go(func() error {
91-
_, err := dag.Docker(m.Source.Directory("frontend"), m.InfisicalClientSecret, repoName+"-frontend", dagger.DockerOpts{
95+
_, err := dag.Docker(m.Source.Directory("frontend"), m.InfisicalClientSecret, m.RepoName+"-frontend", dagger.DockerOpts{
9296
Environment: env,
9397
}).Build().Publish(ctx)
9498

.github/workflows/deploy.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ on:
77

88
jobs:
99
deploy:
10-
uses: mocbotau/infra-workflows/.github/workflows/generic-deploy.yaml@main
10+
uses: mocbotau/infra-workflows/.github/workflows/generic-deploy.yaml@v0.1.1
1111
with:
1212
event-name: ${{ github.event_name }}
1313
environment: "prod"
14+
repo-name: "macroservices"
1415
secrets: inherit

dagger.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"dependencies": [
88
{
99
"name": "docker",
10-
"source": "https://github.com/mocbotau/infra-dagger-modules/modules/docker@main",
11-
"pin": "1796026f67576c4024c37937d6db12358e4d2e70"
10+
"source": "https://github.com/mocbotau/infra-dagger-modules/modules/docker@v0.1.1",
11+
"pin": "5018bf86297ee0511a95b643d62e2baa5c4a5834"
1212
},
1313
{
1414
"name": "node-ci",
15-
"source": "https://github.com/mocbotau/infra-dagger-modules/modules/node-ci@main",
16-
"pin": "1796026f67576c4024c37937d6db12358e4d2e70"
15+
"source": "https://github.com/mocbotau/infra-dagger-modules/modules/node-ci@v0.1.1",
16+
"pin": "5018bf86297ee0511a95b643d62e2baa5c4a5834"
1717
}
1818
],
1919
"source": ".dagger"

0 commit comments

Comments
 (0)