WIP

README.md

@@ -3,7 +3,7 @@
 
 docker run --privileged --rm -v "${PWD}":/work \
   cgr.dev/chainguard/melange build melange.yaml \
-  --arch x86,amd64 \
+  --arch x86_64,amd64 \
   --signing-key melange.rsa
 
 docker run --rm -v ${PWD}:/work cgr.dev/chainguard/apko \

azcopy.melange.yaml

@@ -2,16 +2,21 @@ package:
   name: azcopy-postgres
   version: "10.17.0"
   epoch: 0
-  description: tool azcopy and postgress client
+  description: tool azcopy and postgres client
   target-architecture:
     - x86_64
 environment:
   contents:
     repositories:
       - https://dl-cdn.alpinelinux.org/alpine/edge/main
       - https://dl-cdn.alpinelinux.org/alpine/edge/community
+      - https://packages.wolfi.dev/bootstrap/stage3
+      - https://packages.wolfi.dev/os
+    keyring: 
+      - https://packages.wolfi.dev/bootstrap/stage3/wolfi-signing.rsa.pub
+      - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
     packages:
-      - alpine-baselayout
+      # - wolfi-baselayout
       - busybox
       - ca-certificates-bundle
       - build-base
@@ -20,13 +25,45 @@ environment:
       - openssl
       - openssl-dev
       - go
-      - libffi
-      - libc6-compat
-      - make
-      - linux-headers
+      # - libffi
+      # - libc6-compat
+      # - musl
+      # - libc-dev
+      # - make
+      # - linux-headers
       - wget
-      - postgresql-client
+      - curl
+      - automake
+      - autoconf
+      - openssl-dev
+      - libedit-dev
+      - zlib-dev
+      - libxml2-dev
+      - bison
+      - flex
+      - execline-dev
+      - util-linux-dev
 pipeline:
+# Postgresql client
+  - uses: fetch
+    with:
+      expected-sha256: 13109e2b71f1139405c27201da3733a61ace72ee1c228d9c9f0320e06aee14c2
+      uri: https://ftp.postgresql.org/pub/source/v11.19/postgresql-11.19.tar.bz2
+  - uses: autoconf/configure
+    with:
+      opts: |
+        --mandir=/usr/share/man \
+        --with-openssl \
+        --with-libedit-preferred
+  # --with-uuid=e2fs requores util-linux, let's avoid this package for now
+  # MAKELEVEL=0 is used because of a postgresql build system bug:
+  # https://www.postgresql.org/message-id/15407-7b64e5de97dedc5e%40postgresql.org
+  - uses: autoconf/make
+    with:
+      opts: MAKELEVEL=0
+  - uses: autoconf/make-install
+  - uses: strip
+
   - uses: fetch
     with:
       expected-sha256: f970ad5a68fb0a84935bedc687a6ed8a9d051791e61b032a433ff1cf0ac38105
@@ -41,4 +78,12 @@ pipeline:
       go build
       mkdir -p ${{targets.destdir}}/usr/local/bin
       mv ./azure-storage-azcopy "${{targets.destdir}}"/usr/local/bin/azcopy
-      chmod +x ${{targets.destdir}}/usr/local/bin/azcopy
+      chmod +x ${{targets.destdir}}/usr/local/bin/azcopy
+
+subpackages:
+  - name: postgresql-11-client
+    description: PostgreSQL client
+    pipeline:
+      - runs: |
+          mkdir -p ${{targets.subpkgdir}}/usr/bin
+          mv ${{targets.destdir}}/usr/bin/psql ${{targets.subpkgdir}}/usr/bin/

latest.apko.yaml

@@ -3,11 +3,13 @@ contents:
     - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
   repositories:
     - https://packages.wolfi.dev/os
-    - '@local ./packages'
+    - packages
   packages:
     - wolfi-baselayout
     - busybox
-    - azcopy-postgres@local
+    - glibc
+    - bash
+    - azcopy-postgres
 
 accounts:
   groups: