1
0
Fork 0
Commit graph

61 commits

Author SHA1 Message Date
34b0d6f4ea
make: Don't add a / between PREFIX and the compound dir
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-04 21:35:48 +02:00
31d94b5266
generate: generate: Bump to 0.0.6
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-04 21:34:47 +02:00
260a0dcc52
generate: container: Improve optional feature handling
Things missing should now cause less problems.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-04 21:33:41 +02:00
6d9f63abb5
generate: container: Remove Nones and log_error() on missing optional keys
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-04 20:45:52 +02:00
4d86b49ed4
containerctl: s/generate_config/generate_container
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-04 20:38:22 +02:00
7a863bb7ea
containerctl: list_configs() should not use -type d
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-04 20:36:29 +02:00
7471bfbf70
generate: generate: Bump version to 0.0.5
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-04 20:32:43 +02:00
76b8728fec
generate: container: Fix Ports.command
The long option is --publish, not --ports...

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-04 20:32:04 +02:00
acacf19a12
generate: container: Drop or change removed log functions
Either drop the invocations or change them to log_error().

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-01 19:46:14 +02:00
d097cedc6b
generate: log: Simplify the Log class
Drop hard Log Levels and log_info() and _debug()

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-01 19:41:25 +02:00
0654f06a71
generate: container: The correct data type is guaranteed by maybe_or()
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-08-01 19:28:34 +02:00
07bd99d38e
REUSE: Add containerrc to CC0 group
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 11:26:12 +02:00
5bcf2f846c
generate: generate: Bump generate version to 0.0.4
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 11:25:07 +02:00
058af68169
generate: container: Implement Memory Accounting support
Add a Memory class and create it and its options from the Accounting
class.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 11:23:30 +02:00
6767d4e3af
example.container: Add accounting.memory example
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 11:12:52 +02:00
e8d3cd96eb
containerrc: Expand schema to allow memory accounting
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 11:12:38 +02:00
a8bf51020d
generate: container: Implement timezone support
Get timezone from the container config and fall back to local, which
uses the hosts timezone, if the config entry is missing or not a string.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 11:07:21 +02:00
3908ab3013
example.container: Add timezone example
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 11:03:29 +02:00
0a46bba629
containerrc: Add support for timezone changing
Might be needed for some applications.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 11:02:56 +02:00
18bb31cb96
generate: generate: Bump generate version to 0.0.3
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 11:00:13 +02:00
3ed71b48ef
generate: container: Switch some maybe() calls to maybe_or()
Some places can use maybe_or() intead of maybe(), so use it there.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 10:59:18 +02:00
487be8c49a
generate: container: Don't warn or crash on missing optional keys
The entire accounting section is optional, so silently ignore when it is missing.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 10:51:33 +02:00
658fc6465c
containerrc: Run %s/ /\t/g on containerc
Replace indentation with tabs, by replacing every two spaces with one
tab.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 10:45:31 +02:00
1c2224cb19
containerrc: Remove extra } from schema
Those two are not needed.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 10:44:31 +02:00
8464196aaa
containerrc: Add accounting to schema
Adds accounting and its entries to the JSON schema.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 10:42:25 +02:00
4224112c62
generate: container: Fix Cgroup.command formatting
--cgroup-conf was missing the seperator.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 10:34:13 +02:00
1cd43e0c95
generate: container: Fix maybe_or()
isinstance() sadly can not get the type itself, so type() needs to be
called on _or first.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 10:32:15 +02:00
93245d5bc6
genreate: container: Add accounting support to Container.create
Add support for accouting to __init__ and create.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 10:31:02 +02:00
2a7bb0115c
generate: container: Implement Accounting, Cgroup and Cpu
Implment the 'Accounting', 'Cgroup', and 'Cpu' classes to control the
contaienr cgroup and cpu usage.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 10:24:51 +02:00
57b983e876
example.container: Add resource accounting
Add 'accounting' and its child-objects 'cgroup' and 'cpu' to control
the container cgroup and cpu usage.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-30 10:22:25 +02:00
e100abf698
example.container: Show a host volume in the example config
Since that is now possible, show an example for a host volume in the
example configuration.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-29 10:07:38 +02:00
a601e76a93
generate: container: Enable usage of host files / directories as volumes
From podman-create(1):

	If a volume source is specified, it must be a path on the host or the
	name of a named volume. Host paths are allowed to be absolute or relative;
	relative paths are resolved relative to the directory Podman is run in.
	If the source does not exist, Podman returns an error. Users must pre-create
	the source files or directories. Any source that does not begin with
	a . or / is treated as the name of a named volume.

Implement this with the is_host_volume() check.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-29 10:03:14 +02:00
4ce53cb20b
example.container: Update example config with volume mount options
Volumes can be mounted with some different flags or no flags at all.
Since converting the string into an object would be overkill, as most of
the time the default options should suffice, and branching in
Volumes.from_json() to handle both strings and objects is also no the
cleanest method, implement it by using what already exists. Mount points
are not checked by the script, so the mount options can just be added to
the CONTAINER-DIR part of the volume config.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-29 09:50:56 +02:00
3616cc9abd
generate: container: Split Secret.command()'s cmd over multiple lines
Neatly sperate the options to one per line.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-29 09:46:01 +02:00
53677fb84e
generate: container: Add missing f to f-strings
Two f-strings where missing their f and thus volume creation and
env-file deletion where broken.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-29 09:42:22 +02:00
ba7827d83b
generate: generate: Add a identifying header to generated scripts
Add a header stating that the script was generated, which version
generated it and where to send bug reports.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-29 09:38:39 +02:00
ff663f7835
generate: generate: Handle empty control scripts
When a given control script is empty, because the current config is
missing a value for said script or is malformed, a script with only
the shebang was written. Change it, so that it now executes true.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-29 09:31:52 +02:00
ef63c0de14
containerrc: Remove optional parts from schema
A container can be created from a name and an image, no other part is
required. Reflect that in the JSON schema, by removing most top-level
required entries. Also remove the hardcoded env-vars from the schema.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-29 09:25:19 +02:00
64b797d18d
containerrc: Add json-schmea for config file
Add a json-schema generated by www.liquid-technologies.com/online-json-to-schema-converter
modified to remove hard-coded values from the example conifg (like
MySecret1).

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-26 21:49:32 +02:00
13ab593a59
generate: container: Fix printf call in Environment.create
When creating the env-vars printf is called with arguments in single
quotes to prevent variable and sub-shell expansions. However, only one
single quote was passed as an argument to printf, but two format
specifiers are present in the escpaed string.

Fix this by adding another \"'\" to the variable cmd.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-26 21:39:28 +02:00
5237a70f3e
make: Add makefile to support install
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-26 19:26:21 +02:00
ec8e088b3f
reuse: Add LICENSE symlink for tools that expect it
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-26 19:06:00 +02:00
83a2a38180
reuse: Add reuse information
Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-26 19:04:27 +02:00
d1e4452a5d
containerctl: Fix log_error() not logging a timestamp
As ${TODAY} was forgotten, the first argument from ${@} was used as a
timestamp instead, resulting in malformed log messages. Fix this by
adding ${TDOAY} before ${@}.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-26 16:51:40 +02:00
131ff71f34
generate: container: Use ",".join() and fix Secret.command()
Use ",".join() instead of the custom join() method and fix
Secret.command() by checking if secret_type and not target is mount...

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-22 16:50:24 +02:00
2216bf68da
generate: generate: Remove debug statements
No longer needed.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-22 16:49:55 +02:00
ca9d914449
generate: container: Remove command_join()
It is not used anywhere, so it can be safely removed.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-22 16:20:51 +02:00
6963fdea2a
generate: generate: Explicitly catch ConfigError
Catch ConfigError instead of Exception, which also renders noqa BLE001
obsolete.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-22 16:17:46 +02:00
72062edbf5
generate: container: Fix some issues reported by pylint
This fixes various issues reported by pylint. It now only reports to
issues, that can be ignored, since they're only about too many local
variables or class attributes.

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-22 16:15:47 +02:00
e2f2b3e35f
generate: container: Fix spelling mistake
Search, not serach...

Signed-off-by: Enno Tensing <tenno@suij.in>
2025-07-22 15:58:53 +02:00