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

update to compose v2 and cleanup #607

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions changelog/@unreleased/pr-607.v2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type: fix
fix:
description: Update dependencies so docker compose v2 is used by default, and remove
old unused scripts.
links:
- https://github.com/palantir/docker-proxy-rule/pull/607
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2'
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This field is no longer specified in the yaml files for docker compose v2.


services:
webserver:
hostname: web
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2'

services:
webserver:
hostname: web
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2'

services:
proxy:
image: {{IMAGE_NAME}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2'

services:
webserver:
hostname: web
Expand Down
9 changes: 0 additions & 9 deletions scripts/circle-ci/download-moreutils.sh

This file was deleted.

10 changes: 0 additions & 10 deletions scripts/circle-ci/install-docker.sh

This file was deleted.

5 changes: 0 additions & 5 deletions scripts/time-cmd.sh

This file was deleted.

20 changes: 10 additions & 10 deletions versions.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Run ./gradlew writeVersionsLock to regenerate this file
com.fasterxml.jackson.core:jackson-annotations:2.15.3 (5 constraints: ba5ce35e)
com.fasterxml.jackson.core:jackson-core:2.15.3 (9 constraints: 02cbb5a7)
com.fasterxml.jackson.core:jackson-databind:2.15.3 (13 constraints: 0a08fda5)
com.fasterxml.jackson.core:jackson-core:2.15.3 (9 constraints: 04cb35aa)
com.fasterxml.jackson.core:jackson-databind:2.15.3 (13 constraints: 0c0823aa)
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3 (1 constraints: 7e1c99a4)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.3 (1 constraints: 7e1c99a4)
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3 (1 constraints: f215aae8)
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2 (1 constraints: f415b2e8)
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.3 (1 constraints: 7e1c99a4)
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3 (1 constraints: 7e1c99a4)
com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.3 (1 constraints: 7e1c99a4)
Expand All @@ -18,10 +18,10 @@ com.google.guava:guava:21.0 (2 constraints: cc2bc2d1)
com.palantir.conjure.java:conjure-lib:5.67.0 (1 constraints: 661bc860)
com.palantir.conjure.java.api:errors:2.19.0 (1 constraints: 2410a5a9)
com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:6.16.0 (1 constraints: f715cbe8)
com.palantir.docker.compose:docker-compose-junit-jupiter:1.8.0 (1 constraints: 0b050836)
com.palantir.docker.compose:docker-compose-rule-core:1.8.0 (3 constraints: 1033d6c2)
com.palantir.docker.compose:docker-compose-rule-events-api-objects:1.8.0 (1 constraints: c315c2d2)
com.palantir.docker.compose:docker-compose-rule-junit4:1.8.0 (1 constraints: 0b050836)
com.palantir.docker.compose:docker-compose-junit-jupiter:2.3.0 (1 constraints: 0705fe35)
com.palantir.docker.compose:docker-compose-rule-core:2.3.0 (3 constraints: 0433bcbf)
com.palantir.docker.compose:docker-compose-rule-events-api-objects:2.3.0 (1 constraints: bf15b8d2)
com.palantir.docker.compose:docker-compose-rule-junit4:2.3.0 (1 constraints: 0705fe35)
com.palantir.ri:resource-identifier:1.3.0 (1 constraints: ec0f6e99)
com.palantir.safe-logging:preconditions:1.16.0 (4 constraints: 644ae273)
com.palantir.safe-logging:safe-logging:1.16.0 (2 constraints: f920db6c)
Expand All @@ -30,7 +30,7 @@ commons-io:commons-io:2.6 (1 constraints: 64156da7)
javax.annotation:javax.annotation-api:1.3.2 (1 constraints: f10f7399)
javax.ws.rs:javax.ws.rs-api:2.1.1 (1 constraints: f10f7399)
joda-time:joda-time:2.10.8 (2 constraints: 222ca439)
junit:junit:4.13.2 (2 constraints: e31b93a3)
junit:junit:4.13.2 (2 constraints: 841bfe6b)
one.util:streamex:0.8.1 (2 constraints: cd1a403c)
org.apache.commons:commons-lang3:3.7 (1 constraints: 661571a7)
org.apiguardian:apiguardian-api:1.1.2 (5 constraints: 105480ac)
Expand All @@ -40,8 +40,8 @@ org.hamcrest:hamcrest-core:2.1 (1 constraints: cc05fe3f)
org.junit.jupiter:junit-jupiter-api:5.8.2 (4 constraints: 0547af6b)
org.junit.platform:junit-platform-commons:1.8.2 (2 constraints: dd200b4b)
org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49)
org.slf4j:slf4j-api:1.7.30 (2 constraints: fe2397b2)
org.yaml:snakeyaml:1.27 (1 constraints: 7217fa27)
org.slf4j:slf4j-api:1.7.36 (2 constraints: 042493b3)
org.yaml:snakeyaml:2.0 (1 constraints: 3a178910)

[Test dependencies]
net.bytebuddy:byte-buddy:1.14.11 (1 constraints: 460b40de)
Expand Down
2 changes: 1 addition & 1 deletion versions.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
com.fasterxml.jackson.core:jackson-databind = 2.15.3
com.google.auto.service:* = 1.1.1
com.palantir.docker.compose:* = 1.8.0
com.palantir.docker.compose:* = 2.3.0
junit:junit = 4.13.2
one.util:streamex = 0.8.1
org.assertj:assertj-core = 3.22.0
Expand Down