diff --git a/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/Dockerfile b/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/Dockerfile index 3162c8a98..4d9862202 100644 --- a/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/Dockerfile +++ b/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/Dockerfile @@ -1,7 +1,8 @@ -FROM alpine:3.11 +FROM registry.fedoraproject.org/fedora:34 ENTRYPOINT [ "/entrypoint.sh" ] -RUN apk add --no-cache --update --upgrade ca-certificates postgresql-client -RUN apk add --no-cache --update --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing cfssl +RUN dnf install --setopt=tsflags=nodocs -y \ + postgresql \ + golang-github-cloudflare-cfssl COPY . . diff --git a/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/entrypoint.sh b/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/entrypoint.sh index a172eaa7d..f2397d313 100755 --- a/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/entrypoint.sh +++ b/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/entrypoint.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # set -o errexit -o nounset -o pipefail diff --git a/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/gencerts.sh b/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/gencerts.sh index 66731dfea..fbbfa71c8 100755 --- a/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/gencerts.sh +++ b/assets/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/gencerts.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -eux diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go index e2af56afc..4ddb51494 100644 --- a/pkg/assets/generated_assets.go +++ b/pkg/assets/generated_assets.go @@ -7007,9 +7007,9 @@ var vfsgenAssets = func() http.FileSystem { "/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/Dockerfile": &vfsgen۰CompressedFileInfo{ name: "Dockerfile", modTime: time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC), - uncompressedSize: 247, + uncompressedSize: 190, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x8e\xb1\x6a\x03\x31\x0c\x40\x77\x7f\x85\xc8\x2e\x9b\xd0\x2d\xd0\xa9\xb4\xd0\xa1\x77\xe1\x48\x87\x50\x3a\x18\x5b\xf1\x89\x1a\xd9\xb5\x14\xe8\xfd\x7d\x87\xfb\x82\x6c\xef\x2d\x8f\xf7\xb6\xcc\x1f\x10\x6b\x67\xa1\xd3\x93\x3f\x1e\xdd\xeb\x74\x59\xae\xe7\xf9\x7d\xba\xc0\x17\x1c\x02\x89\x8d\xad\x37\x16\xf3\xba\x1e\xe0\xdb\xb9\xe5\x73\x82\xd8\x7f\x20\xe6\x0c\x88\xd2\x30\xc5\xb4\x12\x20\xde\x7b\x8e\xb6\x43\x19\x31\x13\xa4\x88\x89\x86\xf1\x8d\x53\x34\x52\xe8\x4d\xad\x0c\xd2\xdf\x8a\xa9\x32\x89\x3d\xd0\x42\x1c\xd4\x9b\xb2\xb5\xb1\x3d\xaf\x66\xfd\x14\x42\xae\x98\xb2\xf8\xfd\xbe\xb2\xdc\xff\x7c\x1b\x25\xec\x1e\x28\x17\x0a\x46\x6a\x2c\x05\xd2\x4d\xb5\x3a\xf7\x32\x9f\xaf\xe0\xc1\xbb\xff\x00\x00\x00\xff\xff\x21\xfd\x30\xdd\xf7\x00\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x4c\xc8\xbd\x4e\xc4\x30\x0c\x00\xe0\x3d\x4f\x61\xdd\x9e\xdc\x00\x13\x52\x27\x04\x12\x03\x6d\x55\x95\xa1\x02\x86\x90\xbf\x06\x59\x71\xb0\xdd\xa1\x6f\xcf\x00\xc3\x7d\xe3\xf7\xbc\x4c\xaf\xc0\xa9\x54\x51\x3e\x5d\x4e\x91\xd8\x77\xa6\xef\x14\xd4\x11\x97\xeb\xdf\x3c\xdc\xdd\x9b\xa7\x71\x5d\xb6\x79\x7a\x19\x57\x78\x87\xcb\x35\x35\xe5\xb3\x53\x6d\xea\x64\xbf\xc0\xa7\x31\xcb\xdb\x08\xb1\x65\xa8\x4d\xd4\x23\x82\xb5\x92\x94\xba\x0e\x2a\x19\x7d\x91\xa1\x51\xa4\x20\x60\x4f\xf8\x30\xf0\xaf\x93\x68\xe1\x24\x3f\x78\x93\x85\xd0\xb7\x62\x4b\xd5\xfd\xf8\xb2\x01\xe9\x88\x19\x3d\x27\x1b\xb2\x08\x1a\xf3\x38\xcd\x1b\x38\x70\xe6\x37\x00\x00\xff\xff\x41\xb1\xce\x66\xbe\x00\x00\x00"), }, "/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/ca-config.json": &vfsgen۰CompressedFileInfo{ name: "ca-config.json", @@ -7028,16 +7028,16 @@ var vfsgenAssets = func() http.FileSystem { "/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/entrypoint.sh": &vfsgen۰CompressedFileInfo{ name: "entrypoint.sh", modTime: time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC), - uncompressedSize: 181, + uncompressedSize: 183, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2c\xc8\xcf\x4e\x84\x30\x10\x80\xf1\x73\xe7\x29\xc6\xc2\x41\x0f\xa5\x77\xbd\x18\x0d\x07\x23\xf1\x80\xdc\x8c\x21\x58\x06\x3a\x51\x5b\x32\x2d\x9b\xfd\x93\x7d\xf7\xcd\x92\xbd\x7d\xdf\xaf\xb8\xb3\x6b\x12\xfb\xc3\xc1\x52\xd8\x61\xf2\x00\x05\x26\xca\x68\x22\x92\x08\xed\x79\xcb\x10\xd7\x70\xd3\x85\x17\x9a\x06\xfe\x03\xe0\x09\xbf\xd0\x1c\x51\x97\xa7\xee\xed\xe3\xbd\x6e\x5f\xea\xa6\xe9\xbb\xe6\xb3\x7f\xad\xdb\xee\xd1\x9c\x35\x7e\x3f\x61\xf6\x14\x40\xdd\x83\x52\xe4\x7c\x44\xed\x84\x86\xcc\x61\xc6\x91\x85\x5c\x8e\x72\xd0\xa0\xd4\xff\xef\xc8\x82\x66\x41\xed\x48\x72\xba\x52\x65\x67\x0a\xdb\x55\xc9\x83\x7a\x80\x89\x01\x74\xf9\xac\xe1\x12\x00\x00\xff\xff\xda\xa1\x9d\xec\xb5\x00\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2c\xc8\xc1\x4e\x84\x30\x10\x80\xe1\x73\xe7\x29\xc6\xc2\x41\x0f\xa5\x77\xbd\x18\x0d\x07\x23\xf1\x80\xdc\x8c\x21\x50\x06\x3a\x51\x5b\x32\x2d\x46\x77\xb3\xef\xbe\x59\xb2\xb7\xff\xff\x8a\x1b\xbb\x25\xb1\x23\x07\x4b\xe1\x17\xc7\x21\x79\x80\x02\x13\x65\x34\x11\x49\x84\xfe\x78\xcf\x10\xb7\x70\xd5\x95\x57\x9a\x07\xfe\x06\xe0\x19\x3f\xd0\x1c\x50\x97\xc7\xee\xe5\xed\xb5\x6e\x9f\xea\xa6\xe9\xbb\xe6\xbd\x7f\xae\xdb\xee\xde\x9c\x34\x7e\x3e\x60\xf6\x14\x40\xdd\x82\x52\xe4\x7c\x44\xed\x84\x86\xcc\x61\xc1\x89\x85\x5c\x8e\xf2\xaf\x41\xa9\x9f\xaf\x89\x05\xcd\x8a\xda\x91\xe4\x74\xa1\xca\x2e\x14\xf6\xab\x92\x07\x75\x07\x33\x03\xe8\xf2\x51\xc3\x39\x00\x00\xff\xff\xb0\x20\x22\xdd\xb7\x00\x00\x00"), }, "/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/gencerts.sh": &vfsgen۰CompressedFileInfo{ name: "gencerts.sh", modTime: time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC), - uncompressedSize: 571, + uncompressedSize: 573, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x90\x4b\x6e\xe3\x30\x0c\x86\xd7\xd6\x29\xfe\x24\x6b\xc7\x07\x18\x78\x2e\x32\x33\x0b\x85\xa6\x62\x4e\xf4\x30\x44\x39\xae\x81\x1e\xbe\xf0\xa3\x80\x1b\xa0\xe8\xee\x27\xf5\x81\xfc\xc4\xcb\xa9\x19\x35\x37\x37\x89\x0d\xc7\x27\xb4\x37\x46\xb9\xa0\xe6\xf1\xcd\x18\xea\xd0\x10\xe7\xa2\xc6\x88\xc3\x1f\x9c\x50\x3b\x90\xad\x1f\x3c\x5f\x07\x0e\xf8\xf7\x0b\xa5\xe7\x68\x2a\x72\xaa\x1e\x77\x8e\x0b\x8d\xbf\xa6\xaa\x6a\x89\x52\xc8\x82\xec\xf5\xbf\xa6\x88\x77\xac\xcc\x9a\xeb\x9b\xcd\x0c\xb2\xc6\xc9\x71\xb0\x72\x7e\x72\xfe\x71\x30\xd9\x96\xec\x4a\xed\xe5\xa2\xd3\x1e\xac\xb6\x76\x8a\x4e\xee\x6d\x43\x76\x8f\x9b\xc6\xfa\x36\xe4\xe4\xc4\x73\xbb\x2d\x5c\x7b\x5b\xac\x49\xf3\xae\x6b\xaa\xea\x55\x78\x63\x56\x69\xb2\xe5\xa8\xbb\xfb\xfc\xbe\x8d\xb1\xf3\xbc\xe4\x6b\x09\x83\x31\x17\xa4\xe8\x67\x9c\x43\xea\xc4\xcd\xe7\xe5\x4f\x58\x36\x43\x1c\x4a\x1e\xfd\x8c\xc8\xc4\xaa\x36\xcf\x50\x89\xc4\x98\x52\x7e\x38\x9f\x26\x4c\xe2\xfd\xb6\x02\x52\x30\x49\xe9\xcd\x05\x21\x75\x45\x02\x43\xa2\x4b\x70\x29\x83\xbc\x70\x2c\x20\x4b\xbd\xc4\x3b\x86\x31\x0f\x49\x59\x97\xa3\x9e\x40\x61\x40\xad\xf8\x2a\x75\x28\x3f\x6f\x1c\x9e\xdf\x33\x86\xbd\xb2\xa9\x72\x78\x41\x96\x2b\x7c\x04\x00\x00\xff\xff\x73\x3a\x77\xbd\x3b\x02\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x90\x4b\xae\xdb\x30\x0c\x45\xc7\xd6\x2a\x6e\x92\xb1\xe3\x05\x14\xee\x46\xda\x0e\x64\x9a\x8a\xd9\xe8\x63\x88\x72\x5c\x03\x5d\x7c\xe1\x4f\x01\xbf\x00\x0f\x6f\x76\x49\x1d\x90\x47\xbc\x5d\x9a\x49\x73\xd3\x49\x6c\x38\xbe\xd0\x59\x1d\x8c\x51\x2e\xa8\x79\xfa\x63\x0c\xf5\x68\x88\x73\x51\x63\xc4\xe1\x07\x2e\xa8\x1d\xc8\xd6\x4f\x5e\xee\x23\x07\xfc\xfa\x86\x32\x70\x34\x15\x39\x55\x8f\x07\xc7\x95\xc6\x4f\x53\x55\xb5\x44\x29\x64\x41\xf6\xfe\x5b\x53\xc4\x5f\x6c\xcc\x96\xeb\xce\x66\x06\x59\xe3\xe4\x3c\x58\x39\xbf\x38\x7f\x39\x98\x6c\x4b\x76\xa3\x8e\x72\xd5\x69\x4f\x56\x7b\x3b\x45\x27\x8f\xb6\x21\x7b\xc4\x5d\x63\x7b\x1b\x73\x72\xe2\xb9\xdd\x17\x6e\xbd\x3d\xd6\xa4\xf9\xd0\x35\x55\xf5\x2e\xbc\x33\x9b\x34\xd9\x72\xd6\x3d\x7c\xbe\x77\x53\xec\x3d\xaf\xf9\x5e\xc2\x68\xcc\x0d\x29\xfa\x05\xd7\x90\x7a\x71\xcb\x75\xfd\x13\xd6\xcd\x10\x87\x92\x27\xbf\x20\x32\xb1\xaa\xcd\x0b\x54\x22\x31\xe6\x94\x9f\xce\xa7\x19\xb3\x78\xbf\xaf\x80\x14\xcc\x52\x06\x73\x43\x48\x7d\x91\xc0\x90\xe8\x12\x5c\xca\x20\x2f\x1c\x0b\xc8\xd2\x20\xf1\x81\x71\xca\x63\x52\xd6\xf5\xa8\x17\x50\x18\x51\x2b\x3e\x4a\x9d\xca\xff\x37\x0e\xaf\xcf\x19\xc3\x5e\xd9\x54\x39\xbc\x21\xeb\x15\xfe\x05\x00\x00\xff\xff\x49\x59\x3a\x87\x3d\x02\x00\x00"), }, "/terraform-modules/tinkerbell-sandbox/assets/deploy/tls/server-csr.in.json": &vfsgen۰CompressedFileInfo{ name: "server-csr.in.json",