Skip to content
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.

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

Replace \service\ by 'service' so it doesn't get executed by bash #696

Merged
merged 1 commit into from
Mar 6, 2024
Merged

Replace \service\ by 'service' so it doesn't get executed by bash #696

merged 1 commit into from
Mar 6, 2024

Conversation

dorianmariecom
Copy link
Contributor

Fixes #694

@djmb
Copy link
Collaborator

djmb commented Mar 4, 2024

Thanks for the PR @dorianmariecom.

There's two failing tests:

CliBuildTest#test_pull [test/cli/build_test.rb:60]:
Expected /docker\ inspect\ \-f\ '\{\{\ \.Config\.Labels\.service\ \}\}'\ dhh\/app:999\ \|\ grep\ \-x\ app\ \|\|\ \(echo\ "Image\ dhh\/app:999\ is\ missing\ the\ `service`\ label"\ &&\ exit\ 1\)/ to match "INFO [bcf6aaa0] Running /usr/bin/env mkdir -p .kamal on 1.1.1.1\n  INFO [182f6c28] Running /usr/bin/env mkdir -p .kamal on 1.1.1.4\n  INFO [cd245c5d] Running /usr/bin/env mkdir -p .kamal on 1.1.1.2\n  INFO [f59e183b] Running /usr/bin/env mkdir -p .kamal on 1.1.1.3\nAcquiring the deploy lock...\n  INFO [517a2dab] Running docker image rm --force dhh/app:999 on 1.1.1.3\n  INFO [9f64f594] Running docker pull dhh/app:999 on 1.1.1.3\n  INFO [1571ade6] Running docker inspect -f '{{ .Config.Labels.service }}' dhh/app:999 | grep -x app || (echo \"Image dhh/app:999 is missing the 'service' label\" && exit 1) on 1.1.1.3\n  INFO [f3736078] Running docker image rm --force dhh/app:999 on 1.1.1.4\n  INFO [8b52abd7] Running docker pull dhh/app:999 on 1.1.1.4\n  INFO [16f5ca24] Running docker inspect -f '{{ .Config.Labels.service }}' dhh/app:999 | grep -x app || (echo \"Image dhh/app:999 is missing the 'service' label\" && exit 1) on 1.1.1.4\n  INFO [2776ae73] Running docker image rm --force dhh/app:999 on 1.1.1.2\n  INFO [1831d56c] Running docker pull dhh/app:999 on 1.1.1.2\n  INFO [0d2c51b6] Running docker inspect -f '{{ .Config.Labels.service }}' dhh/app:999 | grep -x app || (echo \"Image dhh/app:999 is missing the 'service' label\" && exit 1) on 1.1.1.2\n  INFO [76c7591d] Running docker image rm --force dhh/app:999 on 1.1.1.1\n  INFO [113e06e9] Running docker pull dhh/app:999 on 1.1.1.1\n  INFO [76199b0a] Running docker inspect -f '{{ .Config.Labels.service }}' dhh/app:999 | grep -x app || (echo \"Image dhh/app:999 is missing the 'service' label\" && exit 1) on 1.1.1.1\nReleasing the deploy lock...".

bin/test /home/runner/work/kamal/kamal/test/cli/build_test.rb:56

and

CommandsBuilderTest#test_validate_image [test/commands/builder_test.rb:115]:
--- expected
+++ actual
@@ -1 +1,3 @@
-"docker inspect -f '{{ .Config.Labels.service }}' dhh/app:123 | grep -x app || (echo \"Image dhh/app:123 is missing the `service` label\" && exit 1)"
+# encoding: US-ASCII
+#    valid: true
+"docker inspect -f '{{ .Config.Labels.service }}' dhh/app:123 | grep -x app || (echo \"Image dhh/app:123 is missing the 'service' label\" && exit 1)"


bin/test /home/runner/work/kamal/kamal/test/commands/builder_test.rb:114

If you could resolve those I'll get this merged.

@djmb djmb merged commit 1abd029 into basecamp:main Mar 6, 2024
0 of 7 checks passed
@dorianmariecom
Copy link
Contributor Author

Thanks for merging and resolving the tests

@dorianmariecom dorianmariecom deleted the patch-1 branch March 6, 2024 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants