From 6ef6f9f72ad3f4df0bd7d524e5745400a83a2140 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Mon, 19 Sep 2022 10:59:28 +0200
Subject: [PATCH] Switch from manifest.sh to manifest.yml for new generator

---
 manifest.sh  | 111 ---------------------------------------------------
 manifest.yml | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+), 111 deletions(-)
 delete mode 100644 manifest.sh
 create mode 100644 manifest.yml

diff --git a/manifest.sh b/manifest.sh
deleted file mode 100644
index 05a1adc1..00000000
--- a/manifest.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-# Manifest for image directories creation
-# every dest path will be prefixed by $DESTDIR/$version
-
-DESTDIR='' # optional, defaults to $PWD
-
-# Files containing distgen directives
-DISTGEN_RULES="
-    src=src/cccp.yml
-    dest=cccp.yml;
-
-    src=src/root/usr/share/container-scripts/postgresql/README.md
-    dest=root/usr/share/container-scripts/postgresql/README.md;
-
-    src=src/root/usr/share/container-scripts/postgresql/common.sh
-    dest=root/usr/share/container-scripts/postgresql/common.sh;
-
-    src=src/root/usr/bin/run-postgresql-slave
-    dest=root/usr/bin/run-postgresql-slave
-    mode=0755;
-
-    src=src/root/usr/share/container-scripts/postgresql/openshift-custom-recovery.conf.template
-    dest=root/usr/share/container-scripts/postgresql/openshift-custom-recovery.conf.template;
-
-    src=src/root/usr/share/container-scripts/postgresql/openshift-custom-postgresql-replication.conf.template
-    dest=root/usr/share/container-scripts/postgresql/openshift-custom-postgresql-replication.conf.template;
-
-"
-
-# Files containing distgen directives, which are used for each
-# (distro, version) combination not excluded in multispec
-DISTGEN_MULTI_RULES="
-    src=src/Dockerfile
-    dest=Dockerfile;
-
-    src=src/Dockerfile
-    dest=Dockerfile.rhel7;
-
-    src=src/Dockerfile
-    dest=Dockerfile.rhel8;
-
-    src=src/Dockerfile
-    dest=Dockerfile.rhel9;
-
-    src=src/Dockerfile
-    dest=Dockerfile.c9s;
-
-    src=src/Dockerfile
-    dest=Dockerfile.c8s;
-
-    src=src/Dockerfile.fedora
-    dest=Dockerfile.fedora;
-"
-
-# Symbolic links
-SYMLINK_RULES="
-    link_target=root/usr/share/container-scripts/postgresql/README.md
-    link_name=README.md;
-
-    link_target=../test
-    link_name=test;
-
-    link_target=/usr/bin/run-postgresql
-    link_name=s2i/bin/run
-"
-
-# Files to copy
-COPY_RULES="
-    src=src/root/usr/libexec/fix-permissions
-    dest=root/usr/libexec/fix-permissions
-    mode=0755;
-
-    src=src/content_sets.yml
-    dest=content_sets.yml;
-
-    src=src/root/usr/share/container-scripts/postgresql/openshift-custom-postgresql.conf.template
-    dest=root/usr/share/container-scripts/postgresql/openshift-custom-postgresql.conf.template;
-
-    src=src/root/usr/share/container-scripts/postgresql/scl_enable
-    dest=root/usr/share/container-scripts/postgresql/scl_enable;
-
-    src=src/root/usr/bin/run-postgresql
-    dest=root/usr/bin/run-postgresql
-    mode=0755;
-
-    src=src/root/usr/bin/run-postgresql-master
-    dest=root/usr/bin/run-postgresql-master
-    mode=0755;
-
-    src=src/root/usr/bin/container-entrypoint
-    dest=root/usr/bin/container-entrypoint
-    mode=0755;
-
-    src=src/root/usr/bin/usage
-    dest=root/usr/bin/usage
-    mode=0755;
-
-    src=src/root/usr/libexec/check-container
-    dest=root/usr/libexec/check-container
-    mode=0755;
-
-    src=src/root/usr/share/container-scripts/postgresql/start/set_passwords.sh
-    dest=root/usr/share/container-scripts/postgresql/start/set_passwords.sh;
-
-    src=src/s2i/bin/assemble
-    dest=s2i/bin/assemble
-    mode=0755;
-
-    src=src/s2i/bin/usage
-    dest=s2i/bin/usage
-    mode=0755;
-"
diff --git a/manifest.yml b/manifest.yml
new file mode 100644
index 00000000..461c38b8
--- /dev/null
+++ b/manifest.yml
@@ -0,0 +1,110 @@
+# Manifest for image directories creation
+# every dest path will be prefixed by $DESTDIR/$version
+
+# Files containing distgen directives
+DISTGEN_RULES:
+  - src: src/cccp.yml
+    dest: cccp.yml
+
+  - src: src/root/usr/share/container-scripts/postgresql/README.md
+    dest: root/usr/share/container-scripts/postgresql/README.md
+
+  - src: src/root/usr/share/container-scripts/postgresql/common.sh
+    dest: root/usr/share/container-scripts/postgresql/common.sh
+
+  - src: src/root/usr/bin/run-postgresql-slave
+    dest: root/usr/bin/run-postgresql-slave
+    mode: "0755"
+
+  - src: src/root/usr/share/container-scripts/postgresql/openshift-custom-recovery.conf.template
+    dest: root/usr/share/container-scripts/postgresql/openshift-custom-recovery.conf.template
+
+  - src: src/root/usr/share/container-scripts/postgresql/openshift-custom-postgresql-replication.conf.template
+    dest: root/usr/share/container-scripts/postgresql/openshift-custom-postgresql-replication.conf.template
+
+
+# Files containing distgen directives, which are used for each
+# (distro, version) combination not excluded in multispec
+DISTGEN_MULTI_RULES:
+  - src: src/Dockerfile
+    dest: Dockerfile.centos7
+
+  - src: src/Dockerfile
+    dest: Dockerfile.rhel7
+
+  - src: src/Dockerfile
+    dest: Dockerfile.rhel8
+
+  - src: src/Dockerfile
+    dest: Dockerfile.rhel9
+
+  - src: src/Dockerfile
+    dest: Dockerfile.c9s
+
+  - src: src/Dockerfile
+    dest: Dockerfile.c8s
+
+  - src: src/Dockerfile.fedora
+    dest: Dockerfile.fedora
+
+
+# Files to copy
+COPY_RULES:
+  - src: src/root/usr/libexec/fix-permissions
+    dest: root/usr/libexec/fix-permissions
+    mode: "0755"
+
+  - src: src/content_sets.yml
+    dest: content_sets.yml
+
+  - src: src/root/usr/share/container-scripts/postgresql/openshift-custom-postgresql.conf.template
+    dest: root/usr/share/container-scripts/postgresql/openshift-custom-postgresql.conf.template
+
+  - src: src/root/usr/share/container-scripts/postgresql/scl_enable
+    dest: root/usr/share/container-scripts/postgresql/scl_enable
+
+  - src: src/root/usr/bin/run-postgresql
+    dest: root/usr/bin/run-postgresql
+    mode: "0755"
+
+  - src: src/root/usr/bin/run-postgresql-master
+    dest: root/usr/bin/run-postgresql-master
+    mode: "0755"
+
+  - src: src/root/usr/bin/container-entrypoint
+    dest: root/usr/bin/container-entrypoint
+    mode: "0755"
+
+  - src: src/root/usr/bin/usage
+    dest: root/usr/bin/usage
+    mode: "0755"
+
+  - src: src/root/usr/libexec/check-container
+    dest: root/usr/libexec/check-container
+    mode: "0755"
+
+  - src: src/root/usr/share/container-scripts/postgresql/start/set_passwords.sh
+    dest: root/usr/share/container-scripts/postgresql/start/set_passwords.sh
+
+  - src: src/s2i/bin/assemble
+    dest: s2i/bin/assemble
+    mode: "0755"
+
+  - src: src/s2i/bin/usage
+    dest: s2i/bin/usage
+    mode: "0755"
+
+
+# Symbolic links
+# This section is the last one on purpose because the generator.py
+# does not allow dead symlinks.
+SYMLINK_RULES:
+  - src: root/usr/share/container-scripts/postgresql/README.md
+    dest: README.md
+
+  - src: ../test
+    dest: test
+
+  - src: /usr/bin/run-postgresql
+    dest: s2i/bin/run
+    check_symlink: false  # Disable check of dead symlinks