Skip to content

Commit

Permalink
chore: remove obsolete compose version (#2710)
Browse files Browse the repository at this point in the history
Remove the obsolete version field from all docker compose files to stop
it warning.
  • Loading branch information
stevenh authored Aug 9, 2024
1 parent c88e776 commit 3c052bf
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 13 deletions.
4 changes: 2 additions & 2 deletions modules/compose/compose_api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ func TestDockerComposeAPIComplex(t *testing.T) {
func TestDockerComposeAPIWithStackReader(t *testing.T) {
identifier := testNameHash(t.Name())

composeContent := `version: '3.7'
composeContent := `
services:
api-nginx:
image: docker.io/nginx:stable-alpine
Expand Down Expand Up @@ -475,7 +475,7 @@ services:
func TestDockerComposeAPIWithStackReaderAndComposeFile(t *testing.T) {
identifier := testNameHash(t.Name())
simple, _ := RenderComposeSimple(t)
composeContent := `version: '3.7'
composeContent := `
services:
api-postgres:
image: docker.io/postgres:14
Expand Down
3 changes: 1 addition & 2 deletions modules/compose/testdata/docker-compose-build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
{{ .ServiceType }}-echo:
build:
Expand All @@ -8,4 +7,4 @@ services:
ports:
- target: 8080
published: {{ .Port_0 }}
protocol: tcp
protocol: tcp
3 changes: 1 addition & 2 deletions modules/compose/testdata/docker-compose-complex.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
{{ .ServiceType }}-nginx:
image: docker.io/nginx:stable-alpine
Expand All @@ -10,4 +9,4 @@ services:
- MYSQL_DATABASE=db
- MYSQL_ROOT_PASSWORD=my-secret-pw
ports:
- "{{ .Port_1 }}:3306"
- "{{ .Port_1 }}:3306"
1 change: 0 additions & 1 deletion modules/compose/testdata/docker-compose-container-name.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
{{ .ServiceType }}-nginx:
container_name: {{ .ServiceType }}-nginxy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
{{ .ServiceType }}-nginx:
image: docker.io/nginx:stable-alpine
Expand Down
1 change: 0 additions & 1 deletion modules/compose/testdata/docker-compose-override.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
{{ .ServiceType }}-nginx:
image: docker.io/nginx:stable-alpine
Expand Down
1 change: 0 additions & 1 deletion modules/compose/testdata/docker-compose-postgres.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
{{ .ServiceType }}-postgres:
image: docker.io/postgres:14
Expand Down
1 change: 0 additions & 1 deletion modules/compose/testdata/docker-compose-short-lifespan.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
tzatziki:
image: docker.io/alpine:latest
Expand Down
1 change: 0 additions & 1 deletion modules/compose/testdata/docker-compose-simple.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
{{ .ServiceType }}-nginx:
image: docker.io/nginx:stable-alpine
Expand Down
1 change: 0 additions & 1 deletion modules/compose/testdata/docker-compose-volume.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
{{ .ServiceType }}-nginx:
image: docker.io/nginx:stable-alpine
Expand Down

0 comments on commit 3c052bf

Please sign in to comment.