Skip to content

Commit ddf0c93

Browse files
automated commit
Signed-off-by: Public copy <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 1225a2d commit ddf0c93

File tree

4 files changed

+34
-4
lines changed

4 files changed

+34
-4
lines changed

images/laravel/main.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@ module "latest" {
2121
module "test-latest" {
2222
source = "./tests"
2323
digest = module.latest.image_ref
24+
25+
target_repository = var.target_repository
2426
}
2527

2628
module "test-latest-dev" {
2729
source = "./tests"
2830
check-dev = true
2931
digest = module.latest.dev_ref
32+
33+
target_repository = var.target_repository
3034
}
3135

3236
resource "oci_tag" "latest" {

images/laravel/tests/01-fpm-server.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#!/usr/bin/env bash
22

33
set -o errexit -o nounset -o errtrace -o pipefail -x
4+
source ../libs/libs.sh
5+
6+
IMAGE_NAME=$(echo "$IMAGES" | jq -r '.laravel.ref')
7+
8+
retry_until 6 20 apk add netcat-openbsd
9+
FREE_PORT=3001
410

511
CONTAINER_NAME=${CONTAINER_NAME:-"php-fpm-smoketest-${FREE_PORT}"}
612

images/laravel/tests/main.tf

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,26 @@ data "oci_exec_test" "version" {
1818
script = "docker run --entrypoint php --rm $IMAGE_NAME --version"
1919
}
2020

21-
data "oci_exec_test" "fpm-server" {
22-
digest = var.digest
23-
script = "${path.module}/01-fpm-server.sh"
21+
variable "target_repository" {}
22+
23+
module "bash_sandbox" {
24+
source = "../../../tflib/imagetest/sandboxes/bash"
25+
target_repository = var.target_repository
26+
}
27+
28+
module "fpm-server-test" {
29+
source = "../../../tflib/imagetest/tests/docker-in-docker/"
30+
31+
images = { laravel = var.digest }
32+
33+
tests = concat(
34+
[{
35+
name = "fmp server test"
36+
image = module.bash_sandbox.image_ref
37+
content = [{ source = path.module }]
38+
cmd = "./01-fpm-server.sh"
39+
}],
40+
)
2441
}
2542

2643
data "oci_exec_test" "fpm-shutdown" {
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
# This overrides the active tags variable to be enabled by default
2+
# rather than disabled.
3+
# See https://developer.hashicorp.com/terraform/language/files/override
14
variable "update_active_tags" {
25
description = "Whether to update the active tags in the Chainguard repo."
36
type = bool
47
default = true
5-
}
8+
}

0 commit comments

Comments
 (0)