Skip to content

allow image be different format #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jupe merged 2 commits into from
May 27, 2025
Merged

allow image be different format #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54bea22
allow image be different format
jupe May 27, 2025
1892340
update build
jupe May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __tests__/deployStack.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ describe('deployStack', () => {
.post('/stacks/create/standalone/string', {
name: 'new-stack-name',
stackFileContent:
"version: '3.7'\n\nservices:\n server1:\n image: ghcr.io/username/repo:1.2.3\n deploy:\n update_config:\n order: start-first\n server2:\n image: ghcr.io/username/repo:1.2.3\n deploy:\n update_config:\n order: start-first\n"
"version: '3.7'\n\nservices:\n server1:\n image: 'ghcr.io/username/repo:1.2.3'\n deploy:\n update_config:\n order: start-first\n server2:\n image: ghcr.io/username/repo:1.2.3\n deploy:\n update_config:\n order: start-first\n"
})
.query({
type: 2,
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion example-stack-definition-multi-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.7'

services:
server1:
image: ghcr.io/username/repo:latest
image: 'ghcr.io/username/repo:latest'
deploy:
update_config:
order: start-first
Expand Down
4 changes: 2 additions & 2 deletions src/deployStack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ function generateNewStackDefinition(
const imageWithoutTag = image.substring(0, image.indexOf(':'))
core.info(`Inserting image ${image} into the stack definition`)
const output = stackDefinition.replace(
new RegExp(`${imageWithoutTag}(:.*)?\n`, 'g'),
`${image}\n`
new RegExp(`${imageWithoutTag}:([^\\s'"]+)`, 'g'),
`${image}`
)
core.debug(`Updated stack definition:\n${output}`)
return output
Expand Down