From f53375ec115cdff6c53dbcef1a8ad36d8c23040f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 9 Dec 2020 09:32:15 +0100 Subject: Remove old examples, rename example 3 to scripts Signed-off-by: Matthias Beyer --- examples/packages/1/a/pkg.toml | 17 ++++++ examples/packages/1/b/pkg.toml | 18 ++++++ examples/packages/1/c/pkg.toml | 14 +++++ examples/packages/1/config.toml | 49 ++++++++++++++++ examples/packages/1/pkg.toml | 65 ++++++++++++++++++++++ examples/packages/example_1/Makefile | 15 ----- examples/packages/example_1/README.md | 8 --- examples/packages/example_1/config.toml | 45 --------------- examples/packages/example_1/pkg.toml | 37 ------------ examples/packages/example_1/pkgA/pkg.toml | 26 --------- examples/packages/example_1/pkgB/pkg.toml | 19 ------- examples/packages/example_2/Makefile | 8 --- examples/packages/example_2/README.md | 4 -- examples/packages/example_2/config.toml | 29 ---------- examples/packages/example_2/pkg.toml | 40 ------------- examples/packages/example_2/sub/pkg.toml | 3 - .../packages/example_2/sub/pkg1/1.0.0/pkg.toml | 8 --- .../packages/example_2/sub/pkg1/2.0.0/pkg.toml | 9 --- examples/packages/example_2/sub/pkg1/pkg.toml | 4 -- .../packages/example_2/sub/pkg2/1.0.0/pkg.toml | 7 --- .../packages/example_2/sub/pkg2/2.0.0/pkg.toml | 7 --- examples/packages/example_2/sub/pkg2/pkg.toml | 4 -- examples/packages/example_3/a/pkg.toml | 17 ------ examples/packages/example_3/b/pkg.toml | 18 ------ examples/packages/example_3/c/pkg.toml | 14 ----- examples/packages/example_3/config.toml | 49 ---------------- examples/packages/example_3/pkg.toml | 65 ---------------------- 27 files changed, 163 insertions(+), 436 deletions(-) create mode 100644 examples/packages/1/a/pkg.toml create mode 100644 examples/packages/1/b/pkg.toml create mode 100644 examples/packages/1/c/pkg.toml create mode 100644 examples/packages/1/config.toml create mode 100644 examples/packages/1/pkg.toml delete mode 100644 examples/packages/example_1/Makefile delete mode 100644 examples/packages/example_1/README.md delete mode 100644 examples/packages/example_1/config.toml delete mode 100644 examples/packages/example_1/pkg.toml delete mode 100644 examples/packages/example_1/pkgA/pkg.toml delete mode 100644 examples/packages/example_1/pkgB/pkg.toml delete mode 100644 examples/packages/example_2/Makefile delete mode 100644 examples/packages/example_2/README.md delete mode 100644 examples/packages/example_2/config.toml delete mode 100644 examples/packages/example_2/pkg.toml delete mode 100644 examples/packages/example_2/sub/pkg.toml delete mode 100644 examples/packages/example_2/sub/pkg1/1.0.0/pkg.toml delete mode 100644 examples/packages/example_2/sub/pkg1/2.0.0/pkg.toml delete mode 100644 examples/packages/example_2/sub/pkg1/pkg.toml delete mode 100644 examples/packages/example_2/sub/pkg2/1.0.0/pkg.toml delete mode 100644 examples/packages/example_2/sub/pkg2/2.0.0/pkg.toml delete mode 100644 examples/packages/example_2/sub/pkg2/pkg.toml delete mode 100644 examples/packages/example_3/a/pkg.toml delete mode 100644 examples/packages/example_3/b/pkg.toml delete mode 100644 examples/packages/example_3/c/pkg.toml delete mode 100644 examples/packages/example_3/config.toml delete mode 100644 examples/packages/example_3/pkg.toml (limited to 'examples') diff --git a/examples/packages/1/a/pkg.toml b/examples/packages/1/a/pkg.toml new file mode 100644 index 0000000..64364a2 --- /dev/null +++ b/examples/packages/1/a/pkg.toml @@ -0,0 +1,17 @@ +name = "a" +version = "1" + +[dependencies] +runtime = ["b =2", "c =3"] + +[phases] +package.script = ''' + mkdir /outputs + echo "#BUTIDO:PHASE:package" + echo "#BUTIDO:PROGRESS:90" + + touch /outputs/a-1.pkg + + echo "#BUTIDO:PROGRESS:100" + echo "#BUTIDO:STATE:OK:finished" +''' diff --git a/examples/packages/1/b/pkg.toml b/examples/packages/1/b/pkg.toml new file mode 100644 index 0000000..2ca66e2 --- /dev/null +++ b/examples/packages/1/b/pkg.toml @@ -0,0 +1,18 @@ +name = "b" +version = "2" + +[environment] +FOO = "bar" +BAZ = "bla" + +[phases] +package.script = ''' + mkdir /outputs + echo "#BUTIDO:PHASE:package" + echo "#BUTIDO:PROGRESS:90" + + touch /outputs/b-2.pkg + + echo "#BUTIDO:PROGRESS:100" + echo "#BUTIDO:STATE:OK:finished" +''' diff --git a/examples/packages/1/c/pkg.toml b/examples/packages/1/c/pkg.toml new file mode 100644 index 0000000..538c576 --- /dev/null +++ b/examples/packages/1/c/pkg.toml @@ -0,0 +1,14 @@ +name = "c" +version = "3" + +[phases] +package.script = ''' + mkdir /outputs + echo "#BUTIDO:PHASE:package" + echo "#BUTIDO:PROGRESS:90" + + touch /outputs/c-3.pkg + + echo "#BUTIDO:PROGRESS:100" + echo "#BUTIDO:STATE:OK:finished" +''' diff --git a/examples/packages/1/config.toml b/examples/packages/1/config.toml new file mode 100644 index 0000000..fc0244b --- /dev/null +++ b/examples/packages/1/config.toml @@ -0,0 +1,49 @@ +# Configuration file for BUTIDO for this repository + +# repository of package definitions +releases = "/tmp/example-3-releases" +staging = "/tmp/example-3-staging" +source_cache = "/tmp/example-3-sources" +log_dir = "/tmp/example-3-logs" + +script_highlight_theme = "Solarized (dark)" + +# #### +# +# Log database configuration +# +# #### + +# The database to use +# +# Can be overridden via environment vairbale BUTIDO_DATABASE_URI or set via CLI. +database_host = "localhost" +database_port = 5432 +database_user = "pgdev" +database_password = "password" +database_name = "butido" + + +# Phases which can be configured in the packages +available_phases = [ "unpack", "depinst", "configure", "build", "install", "package" ] + +[docker] +# Images which can be used to build +# images not listed here are automatically rejected +images = [ "debian:bullseye" ] +verify_images_present = true + +# List of docker endpoints +[[docker.endpoints]] +name = "example host name" +uri = "http://0.0.0.0:8095" +endpoint_type = "http" +speed = 1 +maxjobs = 10 + + +[containers] +# environment variables which are allowed during container start +# This way, errors (typos) when passing environment to a build can be prevented +allowed_env = [ "PATH" ] + diff --git a/examples/packages/1/pkg.toml b/examples/packages/1/pkg.toml new file mode 100644 index 0000000..f908065 --- /dev/null +++ b/examples/packages/1/pkg.toml @@ -0,0 +1,65 @@ +version = "1" +version_is_semver = false + +# no patches by default +patches = [] + +[sources.src] +url = "https://github.com/user/repo/archive/sources.tar.gz" +hash.type = "sha1" +hash.hash = "5e8bcaa3c758f84f01935a914e2bbf01309462ae" + +[dependencies] +build = [] +runtime = [] + +# Root description of phases +# can be overridden as well +[phases] + +unpack.script = ''' + {{#each sources}} + echo "{{@key}} {{this.url}}" + echo " {{this.hash.hash}}" + ls /inputs/{{@key}}-{{this.hash.hash}}.source + {{/each}} + + mkdir /build + echo "#BUTIDO:PHASE:unpack" +''' + +# We use a depinst phase here because we don't want to add a Dockerfile to the +# repo where we prepare a build container. +# This is, of course, not be the way it would be done in a real-world scenario! +depinst.script = ''' + {{phase "depinst"}} + {{progress 0}} + for n in {1..10}; do sleep 0.1; done + {{progress 10}} +''' + +configure.script = ''' + {{phase "configure-preparing"}} + for n in {1..10}; do sleep 0.1; done + + {{progress 20}} + for n in {1..10}; do sleep 0.1; done +''' + +build.script = ''' + {{phase "build"}} + + for n in {1..10}; do sleep 0.1; done + + echo "#BUTIDO:PROGRESS:60" + {{progress 60}} +''' + +install.script = ''' + {{phase "install"}} + for n in {1..10}; do sleep 0.1; done + + {{progress 80}} +''' + + diff --git a/examples/packages/example_1/Makefile b/examples/packages/example_1/Makefile deleted file mode 100644 index e178f97..0000000 --- a/examples/packages/example_1/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -REPO=/tmp/butido_example_1 - -setup: release_dir staging_dir - @echo Setting up repository in ${REPO} - @rm -r ${REPO} || true - @mkdir -p ${REPO} - @cp -r . ${REPO}/ - @echo Ready. - -release_dir: - @mkdir -p /tmp/butido-releases - -staging_dir: - @mkdir -p /tmp/butido-staging - diff --git a/examples/packages/example_1/README.md b/examples/packages/example_1/README.md deleted file mode 100644 index 532fedf..0000000 --- a/examples/packages/example_1/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Example package repository 1 - -Example package repository 1 includes a simple chain of dependencies: - - pkgA depends on pkgB - -The root "pkg.toml" file contains some default settings for the packages. - diff --git a/examples/packages/example_1/config.toml b/examples/packages/example_1/config.toml deleted file mode 100644 index 3c5da57..0000000 --- a/examples/packages/example_1/config.toml +++ /dev/null @@ -1,45 +0,0 @@ -# Configuration file for BUTIDO for this repository - -releases = "/tmp/butido-releases" -staging = "/tmp/butido-staging" -source_cache = "/tmp/butido-sources" - -# #### -# -# Log database configuration -# -# #### - -# The database to use -# -# Can be overridden via environment vairbale BUTIDO_DATABASE_URI or set via CLI. -database_host = "localhost" -database_port = 5432 -database_user = "pgdev" -database_password = "password" -database_name = "butido" - - -# Phases which can be configured in the packages -available_phases = [ "unpack", "build", "install", "package" ] - -[docker] -# Images which can be used to build -# images not listed here are automatically rejected -images = [ "debian:bullseye" ] -verify_images_present = true - -# List of docker endpoints -[[docker.endpoints]] -name = "example host name" -uri = "http://0.0.0.0:8095" -endpoint_type = "http" -speed = 1 -maxjobs = 10 - - -[containers] -# environment variables which are allowed during container start -# This way, errors (typos) when passing environment to a build can be prevented -allowed_env = [ "PATH" ] - diff --git a/examples/packages/example_1/pkg.toml b/examples/packages/example_1/pkg.toml deleted file mode 100644 index 4f45db0..0000000 --- a/examples/packages/example_1/pkg.toml +++ /dev/null @@ -1,37 +0,0 @@ -# root package definition - -# We only use semver here -version_is_semver = true - -# environment which is automatically inherited to all other packages -# but can also be overridden in the other packages -environment.FOO = "bar" -environment.BAZ = "bla" - -# no patches by default -patches = [] - -[dependencies] -build = [] -runtime = [] - -# Root description of phases -# can be overridden as well -[phases] - -unpack.script = ''' - echo UnpackPhase -''' - -build.script = ''' - echo BuildPhase -''' - -install.script = ''' - echo InstallPhase -''' - -package.script = ''' - echo PackagePhase -''' - diff --git a/examples/packages/example_1/pkgA/pkg.toml b/examples/packages/example_1/pkgA/pkg.toml deleted file mode 100644 index d82df02..0000000 --- a/examples/packages/example_1/pkgA/pkg.toml +++ /dev/null @@ -1,26 +0,0 @@ -name = "pkgA" -version = "1.0.0" - -[dependencies] -runtime = [ "pkgB =1.0.0" ] - -[[sources]] -url = "http://somerandomthi.ng/foo/bar.tar.gz" -hash.type = "sha1" -hash.hash = "23465" - -[phases] -# overwrites -install.script = ''' - ls /inputs - [[ -e /inputs/pkgB-1.0.0.txt ]] || { - echo "Not found: pkgB-1.0.0" - exit 1 - } - echo Overridden install phase in package pkgA - - mkdir -p /outputs - touch /outputs/pkgA-1.0.0.txt - ls /outputs -''' - diff --git a/examples/packages/example_1/pkgB/pkg.toml b/examples/packages/example_1/pkgB/pkg.toml deleted file mode 100644 index 8685b5d..0000000 --- a/examples/packages/example_1/pkgB/pkg.toml +++ /dev/null @@ -1,19 +0,0 @@ -name = "pkgB" -version = "1.0.0" - -[[sources]] -url = "http://somerandomthi.ng/foo/bar.tar.gz" -hash.type = "sha1" -hash.hash = "23465" - -# overwrites -[phases] - -build.script = ''' - echo Overridden build phase in package pkgB - - mkdir -p /outputs/ - touch /outputs/pkgB-1.0.0.txt - ls /outputs/ -''' - diff --git a/examples/packages/example_2/Makefile b/examples/packages/example_2/Makefile deleted file mode 100644 index 5c7df20..0000000 --- a/examples/packages/example_2/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -REPO=/tmp/butido_example_2 - -setup: - @echo Setting up repository in ${REPO} - @rm -r ${REPO} || true - @mkdir -p ${REPO} - @cp -r . ${REPO}/ - @echo Ready. diff --git a/examples/packages/example_2/README.md b/examples/packages/example_2/README.md deleted file mode 100644 index 4fa3740..0000000 --- a/examples/packages/example_2/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# example 2 - -Deep layering of package definitions. - diff --git a/examples/packages/example_2/config.toml b/examples/packages/example_2/config.toml deleted file mode 100644 index 9d7aeb2..0000000 --- a/examples/packages/example_2/config.toml +++ /dev/null @@ -1,29 +0,0 @@ -# Configuration file for BUTIDO for this repository - -# repository of package definitions -releases = "/dev/null" -staging = "/dev/null" - -# Phases which can be configured in the packages -available_phases = [ "unpack", "build", "install", "package" ] - -[docker] -# Images which can be used to build -# images not listed here are automatically rejected -images = [ "debian:bullseye" ] -verify_images_present = true - -# List of docker endpoints -[[docker.endpoints]] -name = "example host name" -uri = "http://0.0.0.0:8095" -endpoint_type = "http" -speed = 1 -maxjobs = 1 - - -[containers] -# environment variables which are allowed during container start -# This way, errors (typos) when passing environment to a build can be prevented -allowed_env = [ "PATH" ] - diff --git a/examples/packages/example_2/pkg.toml b/examples/packages/example_2/pkg.toml deleted file mode 100644 index 44cf9d9..0000000 --- a/examples/packages/example_2/pkg.toml +++ /dev/null @@ -1,40 +0,0 @@ -# root package definition - -# We only use semver here -version_is_semver = true - -# environment which is automatically inherited to all other packages -# but can also be overridden in the other packages -environment.FOO = "bar" -environment.BAZ = "bla" - -# no patches by default -patches = [] - -[dependencies] -build = [] -build_dep_script = "" -runtime = [] -script = "" - -# Root description of phases -# can be overridden as well -[phases] - -unpack.script = ''' - echo UnpackPhase -''' - -build.script = ''' - echo BuildPhase -''' - -install.script = ''' - echo InstallPhase -''' - -package.script = ''' - echo PackagePhase -''' - - diff --git a/examples/packages/example_2/sub/pkg.toml b/examples/packages/example_2/sub/pkg.toml deleted file mode 100644 index 3b038f8..0000000 --- a/examples/packages/example_2/sub/pkg.toml +++ /dev/null @@ -1,3 +0,0 @@ -unpack.script = ''' - echo Overwritten SUB phase -''' diff --git a/examples/packages/example_2/sub/pkg1/1.0.0/pkg.toml b/examples/packages/example_2/sub/pkg1/1.0.0/pkg.toml deleted file mode 100644 index 9788036..0000000 --- a/examples/packages/example_2/sub/pkg1/1.0.0/pkg.toml +++ /dev/null @@ -1,8 +0,0 @@ -version = "1.0.0" - -[[sources]] -url = "http://somerandomthi.ng/foo/bar-1.0.0.tar.gz" -hash.type = "sha1" -hash.hash = "23465" - - diff --git a/examples/packages/example_2/sub/pkg1/2.0.0/pkg.toml b/examples/packages/example_2/sub/pkg1/2.0.0/pkg.toml deleted file mode 100644 index a46727f..0000000 --- a/examples/packages/example_2/sub/pkg1/2.0.0/pkg.toml +++ /dev/null @@ -1,9 +0,0 @@ -version = "2.0.0" - -[[sources]] -url = "http://somerandomthi.ng/foo/bar-2.0.0.tar.gz" -hash.type = "sha1" -hash.hash = "23465" - - - diff --git a/examples/packages/example_2/sub/pkg1/pkg.toml b/examples/packages/example_2/sub/pkg1/pkg.toml deleted file mode 100644 index 926f6d6..0000000 --- a/examples/packages/example_2/sub/pkg1/pkg.toml +++ /dev/null @@ -1,4 +0,0 @@ -name = "pkg1" - -[dependencies] -runtime = [ "pkg2 =2.0.0" ] diff --git a/examples/packages/example_2/sub/pkg2/1.0.0/pkg.toml b/examples/packages/example_2/sub/pkg2/1.0.0/pkg.toml deleted file mode 100644 index 9e9d3a8..0000000 --- a/examples/packages/example_2/sub/pkg2/1.0.0/pkg.toml +++ /dev/null @@ -1,7 +0,0 @@ -version = "1.0.0" - -[[sources]] -url = "http://somerandomthi.ng/foo/baz-1.0.0.tar.gz" -hash.type = "sha1" -hash.hash = "23465" - diff --git a/examples/packages/example_2/sub/pkg2/2.0.0/pkg.toml b/examples/packages/example_2/sub/pkg2/2.0.0/pkg.toml deleted file mode 100644 index 2a3990a..0000000 --- a/examples/packages/example_2/sub/pkg2/2.0.0/pkg.toml +++ /dev/null @@ -1,7 +0,0 @@ -version = "2.0.0" - -[[sources]] -url = "http://somerandomthi.ng/foo/baz-2.0.0.tar.gz" -hash.type = "sha1" -hash.hash = "23465" - diff --git a/examples/packages/example_2/sub/pkg2/pkg.toml b/examples/packages/example_2/sub/pkg2/pkg.toml deleted file mode 100644 index 8c7b0d2..0000000 --- a/examples/packages/example_2/sub/pkg2/pkg.toml +++ /dev/null @@ -1,4 +0,0 @@ -name = "pkg2" - -[dependencies] -runtime = [ ] diff --git a/examples/packages/example_3/a/pkg.toml b/examples/packages/example_3/a/pkg.toml deleted file mode 100644 index 64364a2..0000000 --- a/examples/packages/example_3/a/pkg.toml +++ /dev/null @@ -1,17 +0,0 @@ -name = "a" -version = "1" - -[dependencies] -runtime = ["b =2", "c =3"] - -[phases] -package.script = ''' - mkdir /outputs - echo "#BUTIDO:PHASE:package" - echo "#BUTIDO:PROGRESS:90" - - touch /outputs/a-1.pkg - - echo "#BUTIDO:PROGRESS:100" - echo "#BUTIDO:STATE:OK:finished" -''' diff --git a/examples/packages/example_3/b/pkg.toml b/examples/packages/example_3/b/pkg.toml deleted file mode 100644 index 2ca66e2..0000000 --- a/examples/packages/example_3/b/pkg.toml +++ /dev/null @@ -1,18 +0,0 @@ -name = "b" -version = "2" - -[environment] -FOO = "bar" -BAZ = "bla" - -[phases] -package.script = ''' - mkdir /outputs - echo "#BUTIDO:PHASE:package" - echo "#BUTIDO:PROGRESS:90" - - touch /outputs/b-2.pkg - - echo "#BUTIDO:PROGRESS:100" - echo "#BUTIDO:STATE:OK:finished" -''' diff --git a/examples/packages/example_3/c/pkg.toml b/examples/packages/example_3/c/pkg.toml deleted file mode 100644 index 538c576..0000000 --- a/examples/packages/example_3/c/pkg.toml +++ /dev/null @@ -1,14 +0,0 @@ -name = "c" -version = "3" - -[phases] -package.script = ''' - mkdir /outputs - echo "#BUTIDO:PHASE:package" - echo "#BUTIDO:PROGRESS:90" - - touch /outputs/c-3.pkg - - echo "#BUTIDO:PROGRESS:100" - echo "#BUTIDO:STATE:OK:finished" -''' diff --git a/examples/packages/example_3/config.toml b/examples/packages/example_3/config.toml deleted file mode 100644 index fc0244b..0000000 --- a/examples/packages/example_3/config.toml +++ /dev/null @@ -1,49 +0,0 @@ -# Configuration file for BUTIDO for this repository - -# repository of package definitions -releases = "/tmp/example-3-releases" -staging = "/tmp/example-3-staging" -source_cache = "/tmp/example-3-sources" -log_dir = "/tmp/example-3-logs" - -script_highlight_theme = "Solarized (dark)" - -# #### -# -# Log database configuration -# -# #### - -# The database to use -# -# Can be overridden via environment vairbale BUTIDO_DATABASE_URI or set via CLI. -database_host = "localhost" -database_port = 5432 -database_user = "pgdev" -database_password = "password" -database_name = "butido" - - -# Phases which can be configured in the packages -available_phases = [ "unpack", "depinst", "configure", "build", "install", "package" ] - -[docker] -# Images which can be used to build -# images not listed here are automatically rejected -images = [ "debian:bullseye" ] -verify_images_present = true - -# List of docker endpoints -[[docker.endpoints]] -name = "example host name" -uri = "http://0.0.0.0:8095" -endpoint_type = "http" -speed = 1 -maxjobs = 10 - - -[containers] -# environment variables which are allowed during container start -# This way, errors (typos) when passing environment to a build can be prevented -allowed_env = [ "PATH" ] - diff --git a/examples/packages/example_3/pkg.toml b/examples/packages/example_3/pkg.toml deleted file mode 100644 index f908065..0000000 --- a/examples/packages/example_3/pkg.toml +++ /dev/null @@ -1,65 +0,0 @@ -version = "1" -version_is_semver = false - -# no patches by default -patches = [] - -[sources.src] -url = "https://github.com/user/repo/archive/sources.tar.gz" -hash.type = "sha1" -hash.hash = "5e8bcaa3c758f84f01935a914e2bbf01309462ae" - -[dependencies] -build = [] -runtime = [] - -# Root description of phases -# can be overridden as well -[phases] - -unpack.script = ''' - {{#each sources}} - echo "{{@key}} {{this.url}}" - echo " {{this.hash.hash}}" - ls /inputs/{{@key}}-{{this.hash.hash}}.source - {{/each}} - - mkdir /build - echo "#BUTIDO:PHASE:unpack" -''' - -# We use a depinst phase here because we don't want to add a Dockerfile to the -# repo where we prepare a build container. -# This is, of course, not be the way it would be done in a real-world scenario! -depinst.script = ''' - {{phase "depinst"}} - {{progress 0}} - for n in {1..10}; do sleep 0.1; done - {{progress 10}} -''' - -configure.script = ''' - {{phase "configure-preparing"}} - for n in {1..10}; do sleep 0.1; done - - {{progress 20}} - for n in {1..10}; do sleep 0.1; done -''' - -build.script = ''' - {{phase "build"}} - - for n in {1..10}; do sleep 0.1; done - - echo "#BUTIDO:PROGRESS:60" - {{progress 60}} -''' - -install.script = ''' - {{phase "install"}} - for n in {1..10}; do sleep 0.1; done - - {{progress 80}} -''' - - -- cgit v1.2.3