From 4e1c909bc483e0bb2ad3baa2e864c6cee9ba99c8 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 9 Dec 2020 09:38:59 +0100 Subject: Move existing definitions to subdirectory 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/1/repo/a/pkg.toml | 17 ++++++++++ examples/packages/1/repo/b/pkg.toml | 18 ++++++++++ examples/packages/1/repo/c/pkg.toml | 14 ++++++++ examples/packages/1/repo/config.toml | 49 +++++++++++++++++++++++++++ examples/packages/1/repo/pkg.toml | 65 ++++++++++++++++++++++++++++++++++++ 10 files changed, 163 insertions(+), 163 deletions(-) delete mode 100644 examples/packages/1/a/pkg.toml delete mode 100644 examples/packages/1/b/pkg.toml delete mode 100644 examples/packages/1/c/pkg.toml delete mode 100644 examples/packages/1/config.toml delete mode 100644 examples/packages/1/pkg.toml create mode 100644 examples/packages/1/repo/a/pkg.toml create mode 100644 examples/packages/1/repo/b/pkg.toml create mode 100644 examples/packages/1/repo/c/pkg.toml create mode 100644 examples/packages/1/repo/config.toml create mode 100644 examples/packages/1/repo/pkg.toml (limited to 'examples') diff --git a/examples/packages/1/a/pkg.toml b/examples/packages/1/a/pkg.toml deleted file mode 100644 index 64364a2..0000000 --- a/examples/packages/1/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/1/b/pkg.toml b/examples/packages/1/b/pkg.toml deleted file mode 100644 index 2ca66e2..0000000 --- a/examples/packages/1/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/1/c/pkg.toml b/examples/packages/1/c/pkg.toml deleted file mode 100644 index 538c576..0000000 --- a/examples/packages/1/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/1/config.toml b/examples/packages/1/config.toml deleted file mode 100644 index fc0244b..0000000 --- a/examples/packages/1/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/1/pkg.toml b/examples/packages/1/pkg.toml deleted file mode 100644 index f908065..0000000 --- a/examples/packages/1/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}} -''' - - diff --git a/examples/packages/1/repo/a/pkg.toml b/examples/packages/1/repo/a/pkg.toml new file mode 100644 index 0000000..64364a2 --- /dev/null +++ b/examples/packages/1/repo/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/repo/b/pkg.toml b/examples/packages/1/repo/b/pkg.toml new file mode 100644 index 0000000..2ca66e2 --- /dev/null +++ b/examples/packages/1/repo/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/repo/c/pkg.toml b/examples/packages/1/repo/c/pkg.toml new file mode 100644 index 0000000..538c576 --- /dev/null +++ b/examples/packages/1/repo/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/repo/config.toml b/examples/packages/1/repo/config.toml new file mode 100644 index 0000000..fc0244b --- /dev/null +++ b/examples/packages/1/repo/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/repo/pkg.toml b/examples/packages/1/repo/pkg.toml new file mode 100644 index 0000000..f908065 --- /dev/null +++ b/examples/packages/1/repo/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}} +''' + + -- cgit v1.2.3