diff --git a/.github/workflows/build-postgres.yml b/.github/workflows/build-postgres.yml index 46028c174..b8c8e1c31 100644 --- a/.github/workflows/build-postgres.yml +++ b/.github/workflows/build-postgres.yml @@ -12,13 +12,13 @@ concurrency: jobs: build: name: Build - runs-on: firecracker + runs-on: ubuntu-latest # TODO: Change to firecracker permissions: packages: write strategy: fail-fast: false matrix: - tag: [18.3-alpine, 18.3-bookworm, 17.9-alpine, 17.9-bookworm, 17.5-alpine, 17.4-alpine, 17.2-alpine, 16.13-alpine, 16.13-bookworm, 16.10-alpine, 16.10-bookworm, 16.9-alpine, 16.8-alpine, 16.6-alpine, 16.4-alpine, 16.1-alpine, 15.17-alpine, 15.17-bookworm, 15.13-alpine, 15.12-alpine, 15.10-alpine, 15.8-alpine, 15.5-alpine, 14.22-alpine, 14.22-bookworm, 14.19-alpine, 14.19-bookworm, 14.18-alpine, 14.17-alpine, 14.15-alpine, 14.13-alpine, 14.10-alpine] + tag: [18.3-bookworm-dhi,18.3-bookworm-ext] steps: - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 @@ -78,7 +78,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Log in to the DHI registry - uses: docker/login-action@v2 + uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 with: registry: dhi.io username: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/cmd/build-image/main.go b/cmd/build-image/main.go index ed475aaaf..22689c502 100644 --- a/cmd/build-image/main.go +++ b/cmd/build-image/main.go @@ -154,6 +154,7 @@ func main() { if b == nil { panic(fmt.Sprintf("%s app.txt is missing tag %s", *name, *tag)) } + klog.Infoln(b.String()) var repoURL string if strings.Contains(libRepoURL, "github.com/"+api.GH_IMG_REPO_OWNER) { repoURL = libRepoURL @@ -449,7 +450,23 @@ func GetFullName(s string) (string, error) { } func FindBlock(dir, name, tag string) (string, *api.Block, error) { - filename := filepath.Join(dir, "library", name, "app.json") + filename := "" + klog.Infoln(tag) + suf := strings.Split(tag, "-")[len(strings.Split(tag, "-"))-1] + switch suf { + case "dhi": + filename = filepath.Join(dir, "library", name, "dhi.json") + case "ext": + filename = filepath.Join(dir, "library", name, "ext.json") + default: + filename = filepath.Join(dir, "library", name, "app.json") + } + klog.Infoln(filename) + return FindBlockWithGivenFile(filename, tag) +} + +func FindBlockWithGivenFile(filename, tag string) (string, *api.Block, error) { + data, err := os.ReadFile(filename) if err != nil { return "", nil, err @@ -466,5 +483,6 @@ func FindBlock(dir, name, tag string) (string, *api.Block, error) { return h.GitRepo, &b, nil } } + return h.GitRepo, nil, nil } diff --git a/library/postgres/dhi.json b/library/postgres/dhi.json new file mode 100644 index 000000000..ebd80825f --- /dev/null +++ b/library/postgres/dhi.json @@ -0,0 +1,403 @@ +{ + "Name": "postgres", + "GitRepo": "https://github.com/docker-library/postgres.git", + "KnownTags": {}, + "Blocks": [ + { + "Tags": [ + "16.13-alpine-dhi" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "dhi/16.13/alpine", + "File": "Dockerfile" + }, + { + "Tags": [ + "16.13-bookworm-dhi" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "dhi/16.13/bookworm", + "File": "Dockerfile" + }, + { + "Tags": [ + "17.9-alpine-dhi" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "dhi/17.9/alpine", + "File": "Dockerfile" + }, + { + "Tags": [ + "17.9-bookworm-dhi" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "dhi/17.9/bookworm", + "File": "Dockerfile" + }, + { + "Tags": [ + "18.3-alpine-dhi" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "dhi/18.3/alpine", + "File": "Dockerfile" + }, + { + "Tags": [ + "18.3-bookworm-dhi" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "d2c47e08f85e63bf04f4ded353bc3d65e72ff2b8", + "Directory": "dhi/18.3/bookworm", + "File": "Dockerfile" + } + ] +} \ No newline at end of file diff --git a/library/postgres/ext.json b/library/postgres/ext.json new file mode 100644 index 000000000..6398de2f6 --- /dev/null +++ b/library/postgres/ext.json @@ -0,0 +1,403 @@ +{ + "Name": "postgres", + "GitRepo": "https://github.com/docker-library/postgres.git", + "KnownTags": {}, + "Blocks": [ + { + "Tags": [ + "16.13-alpine-ext" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "ext/16.13/alpine", + "File": "Dockerfile" + }, + { + "Tags": [ + "16.13-bookworm-ext" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "ext/16.13/bookworm", + "File": "Dockerfile" + }, + { + "Tags": [ + "17.9-alpine-ext" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "ext/17.9/alpine", + "File": "Dockerfile" + }, + { + "Tags": [ + "17.9-bookworm-ext" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "ext/17.9/bookworm", + "File": "Dockerfile" + }, + { + "Tags": [ + "18.3-alpine-ext" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "ext/18.3/alpine", + "File": "Dockerfile" + }, + { + "Tags": [ + "18.3-bookworm-ext" + ], + "Architectures": { + "amd64": { + "Architecture": "amd64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v5": { + "Architecture": "arm32v5", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm32v7": { + "Architecture": "arm32v7", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "arm64v8": { + "Architecture": "arm64v8", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "i386": { + "Architecture": "i386", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "ppc64le": { + "Architecture": "ppc64le", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "riscv64": { + "Architecture": "riscv64", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + }, + "s390x": { + "Architecture": "s390x", + "Directory": "", + "GitFetch": "", + "GitCommit": "", + "File": "" + } + }, + "GitCommit": "6447b6c03d212bb4dae55c4d307ceda91c62400e", + "Directory": "ext/18.3/bookworm", + "File": "Dockerfile" + } + ] +} \ No newline at end of file