Skip to content

Commit e72572b

Browse files
committed
update tests
1 parent d842e2a commit e72572b

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

  • src/sbt-test/docker
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generate the Docker image locally
22
> Docker/publishLocal
33
$ exists target/**/docker/stage/Dockerfile
4-
$ exists target/**/docker/stage/4/opt/docker/bin/docker-exec
4+
$ exists target/**/docker/stage/40/opt/docker/bin/docker-exec
55
> checkDockerfile
66
$ exec bash -c 'docker run docker-package:0.1.0 | grep -q "Hello world"'

src/sbt-test/docker/test-layer-groups/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ TaskKey[Unit]("checkDockerfile") := {
2424
val copyLines = dockerfile.linesIterator.toList.filter(_.startsWith("COPY --from=stage0"))
2525
assertEquals(
2626
copyLines,
27-
"""COPY --from=stage0 --chown=demiourgos728:root /2/opt/docker /opt/docker
28-
|COPY --from=stage0 --chown=demiourgos728:root /4/opt/docker /opt/docker
27+
"""COPY --from=stage0 --chown=demiourgos728:root /20/opt/docker /opt/docker
28+
|COPY --from=stage0 --chown=demiourgos728:root /40/opt/docker /opt/docker
2929
|COPY --from=stage0 --chown=demiourgos728:root /54/opt/docker /opt/docker
3030
|COPY --from=stage0 --chown=demiourgos728:root /opt/docker /opt/docker""".stripMargin.linesIterator.toList
3131
)

src/sbt-test/docker/test-layer-groups/test

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Generate the Docker image locally
22
> Docker/publishLocal
33
$ exists target/**/docker/stage/Dockerfile
4-
$ exists target/**/docker/stage/4/opt/docker/bin/docker-groups
5-
$ exists target/**/docker/stage/2/opt/docker/lib/org.slf4j.slf4j-api-1.7.30.jar
6-
-$ exists target/**/docker/stage/2/opt/docker/lib/com.example.docker-groups-0.1.0.jar
4+
$ exists target/**/docker/stage/40/opt/docker/bin/docker-groups
5+
$ exists target/**/docker/stage/20/opt/docker/lib/org.slf4j.slf4j-api-1.7.30.jar
6+
-$ exists target/**/docker/stage/20/opt/docker/lib/com.example.docker-groups-0.1.0.jar
77
$ exists target/**/docker/stage/opt/docker/other
8-
$ exists target/**/docker/stage/2
9-
-$ exists target/**/docker/stage/1/opt/docker/lib/org.slf4j.slf4j-api-1.7.30.jar
10-
$ exists target/**/docker/stage/4/opt/docker/lib/com.example.docker-groups-0.1.0.jar
8+
$ exists target/**/docker/stage/20
9+
-$ exists target/**/docker/stage/10/opt/docker/lib/org.slf4j.slf4j-api-1.7.30.jar
10+
$ exists target/**/docker/stage/40/opt/docker/lib/com.example.docker-groups-0.1.0.jar
1111
$ exists target/**/docker/stage/54/opt/docker/spark
1212

1313
$ exec bash -c 'docker run --rm --entrypoint=ls docker-groups:0.1.0 |tr "\n" "," | grep -q "bin,lib,other,spark"'
@@ -20,8 +20,8 @@ $ copy-file changes/nolayers.sbt layers.sbt
2020
> Docker/publishLocal
2121
$ exists target/**/docker/stage/opt/docker/bin
2222
$ exists target/**/docker/stage/opt/docker/spark
23-
-$ exists target/**/docker/stage/2
24-
-$ exists target/**/docker/stage/4
23+
-$ exists target/**/docker/stage/20
24+
-$ exists target/**/docker/stage/40
2525
-$ exists target/**/docker/stage/54
2626
$ exists target/**/docker/stage/opt/docker/lib/org.slf4j.slf4j-api-1.7.30.jar
2727
$ exists target/**/docker/stage/opt/docker/lib/com.example.docker-groups-0.1.0.jar

src/sbt-test/docker/test-packageName-universal/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# Generate the Docker image locally
55
> Docker/publishLocal
66
$ exists target/docker/stage/Dockerfile
7-
$ exists target/docker/stage/4/opt/docker/bin/docker-test
7+
$ exists target/docker/stage/40/opt/docker/bin/docker-test
88
> checkDockerfile
99
$ exec bash -c 'docker run docker-package:0.1.0 | grep -q "Hello world"'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generate the Docker image locally
22
> Docker/publishLocal
33
$ exists target/**/docker/stage/Dockerfile
4-
$ exists target/**/docker/stage/4/opt/docker/bin/docker-test
4+
$ exists target/**/docker/stage/40/opt/docker/bin/docker-test
55
> checkDockerfile
66
$ exec bash -c 'docker run docker-package:0.1.0 | grep -q "Hello world"'

0 commit comments

Comments
 (0)