From 52362e2174593232b1e309abc00307759ad9a8fc Mon Sep 17 00:00:00 2001 From: Nigel Kukard <nkukard@lbsd.net> Date: Tue, 7 Jan 2025 21:57:55 +0000 Subject: [PATCH 1/2] chore: updated copyright to 2025 --- Dockerfile | 2 +- contrib/docker-compose.yml | 2 +- docker_release_version.sh | 2 +- etc/nginx/http.d/50_vhost_default.conf.template | 2 +- etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template | 2 +- tests/docker-compose.yml.mysql.tmpl | 2 +- tests/docker-compose.yml.postgresql.tmpl | 2 +- tests/docker-compose.yml.timescaledb.tmpl | 2 +- tests/run-cluster-test | 2 +- .../flexible-docker-containers/healthcheck.d/48-zabbix-agent.sh | 2 +- .../healthcheck.d/48-zabbix-agent2.sh | 2 +- .../flexible-docker-containers/healthcheck.d/48-zabbix-proxy.sh | 2 +- .../healthcheck.d/48-zabbix-server.sh | 2 +- .../healthcheck.d/48-zabbix-webservice.sh | 2 +- usr/local/share/flexible-docker-containers/init.d/48-zabbix.sh | 2 +- .../flexible-docker-containers/pre-exec-tests.d/48-zabbix.sh | 2 +- .../flexible-docker-containers/pre-init-tests.d/48-zabbix.sh | 2 +- .../share/flexible-docker-containers/pre-init.d/48-zabbix.sh | 2 +- .../share/flexible-docker-containers/tests.d/48-zabbix-agent.sh | 2 +- .../flexible-docker-containers/tests.d/48-zabbix-agent2.sh | 2 +- .../flexible-docker-containers/tests.d/48-zabbix-frontend.sh | 2 +- .../share/flexible-docker-containers/tests.d/48-zabbix-proxy.sh | 2 +- .../flexible-docker-containers/tests.d/48-zabbix-server.sh | 2 +- .../flexible-docker-containers/tests.d/48-zabbix-webservice.sh | 2 +- usr/local/share/flexible-docker-containers/tests.d/99-zabbix.sh | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23e61f3..eadd633 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/contrib/docker-compose.yml b/contrib/docker-compose.yml index d69bccd..7226970 100644 --- a/contrib/docker-compose.yml +++ b/contrib/docker-compose.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/docker_release_version.sh b/docker_release_version.sh index 7bbeed4..464b1a7 100644 --- a/docker_release_version.sh +++ b/docker_release_version.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/etc/nginx/http.d/50_vhost_default.conf.template b/etc/nginx/http.d/50_vhost_default.conf.template index d9725a7..368e092 100644 --- a/etc/nginx/http.d/50_vhost_default.conf.template +++ b/etc/nginx/http.d/50_vhost_default.conf.template @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template b/etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template index 7427f3a..292c556 100644 --- a/etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template +++ b/etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/tests/docker-compose.yml.mysql.tmpl b/tests/docker-compose.yml.mysql.tmpl index e5bf7a2..0187fc6 100644 --- a/tests/docker-compose.yml.mysql.tmpl +++ b/tests/docker-compose.yml.mysql.tmpl @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/tests/docker-compose.yml.postgresql.tmpl b/tests/docker-compose.yml.postgresql.tmpl index b1d7d33..e2a24e1 100644 --- a/tests/docker-compose.yml.postgresql.tmpl +++ b/tests/docker-compose.yml.postgresql.tmpl @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/tests/docker-compose.yml.timescaledb.tmpl b/tests/docker-compose.yml.timescaledb.tmpl index aca3ae8..7f91cfb 100644 --- a/tests/docker-compose.yml.timescaledb.tmpl +++ b/tests/docker-compose.yml.timescaledb.tmpl @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/tests/run-cluster-test b/tests/run-cluster-test index 47ce5f6..267c9a4 100755 --- a/tests/run-cluster-test +++ b/tests/run-cluster-test @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent.sh b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent.sh index 4e15950..114ab8a 100644 --- a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent.sh +++ b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent2.sh b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent2.sh index 2137209..a2be4b6 100644 --- a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent2.sh +++ b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent2.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-proxy.sh b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-proxy.sh index d5bfd87..4239b7f 100644 --- a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-proxy.sh +++ b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-proxy.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-server.sh b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-server.sh index 1e5dcb5..318730a 100644 --- a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-server.sh +++ b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-server.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-webservice.sh b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-webservice.sh index b6763c7..30ea59f 100644 --- a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-webservice.sh +++ b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-webservice.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/init.d/48-zabbix.sh b/usr/local/share/flexible-docker-containers/init.d/48-zabbix.sh index b3b4c57..8550794 100755 --- a/usr/local/share/flexible-docker-containers/init.d/48-zabbix.sh +++ b/usr/local/share/flexible-docker-containers/init.d/48-zabbix.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/pre-exec-tests.d/48-zabbix.sh b/usr/local/share/flexible-docker-containers/pre-exec-tests.d/48-zabbix.sh index cffe781..55eb4d9 100644 --- a/usr/local/share/flexible-docker-containers/pre-exec-tests.d/48-zabbix.sh +++ b/usr/local/share/flexible-docker-containers/pre-exec-tests.d/48-zabbix.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/pre-init-tests.d/48-zabbix.sh b/usr/local/share/flexible-docker-containers/pre-init-tests.d/48-zabbix.sh index 5ce6f92..4175607 100644 --- a/usr/local/share/flexible-docker-containers/pre-init-tests.d/48-zabbix.sh +++ b/usr/local/share/flexible-docker-containers/pre-init-tests.d/48-zabbix.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/pre-init.d/48-zabbix.sh b/usr/local/share/flexible-docker-containers/pre-init.d/48-zabbix.sh index 95b96da..b2c7c1a 100755 --- a/usr/local/share/flexible-docker-containers/pre-init.d/48-zabbix.sh +++ b/usr/local/share/flexible-docker-containers/pre-init.d/48-zabbix.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent.sh index 7939aff..f62da7f 100644 --- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent.sh +++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent2.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent2.sh index 0aae3ac..b06acfe 100644 --- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent2.sh +++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent2.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-frontend.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-frontend.sh index d4d3e4c..8f8f357 100644 --- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-frontend.sh +++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-frontend.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-proxy.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-proxy.sh index 38a1695..00dd822 100644 --- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-proxy.sh +++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-proxy.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-server.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-server.sh index 6a80a64..0690ea6 100644 --- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-server.sh +++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-server.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-webservice.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-webservice.sh index c8fed98..8f74f51 100644 --- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-webservice.sh +++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-webservice.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to diff --git a/usr/local/share/flexible-docker-containers/tests.d/99-zabbix.sh b/usr/local/share/flexible-docker-containers/tests.d/99-zabbix.sh index 696c6fb..79ca447 100644 --- a/usr/local/share/flexible-docker-containers/tests.d/99-zabbix.sh +++ b/usr/local/share/flexible-docker-containers/tests.d/99-zabbix.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, AllWorldIT. +# Copyright (c) 2022-2025, AllWorldIT. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to -- GitLab From e3c234187a83670e91141429c4ed557e0187e41a Mon Sep 17 00:00:00 2001 From: Nigel Kukard <nkukard@lbsd.net> Date: Tue, 7 Jan 2025 21:58:21 +0000 Subject: [PATCH 2/2] fix: fixed LABEL syntax --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index eadd633..50cf01d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -318,9 +318,9 @@ FROM registry.conarx.tech/containers/nginx-php/edge ARG VERSION_INFO= -LABEL org.opencontainers.image.authors "Nigel Kukard <nkukard@conarx.tech>" -LABEL org.opencontainers.image.version "edge" -LABEL org.opencontainers.image.base.name "registry.conarx.tech/containers/nginx-php/edge" +LABEL org.opencontainers.image.authors = "Nigel Kukard <nkukard@conarx.tech>" +LABEL org.opencontainers.image.version = "edge" +LABEL org.opencontainers.image.base.name = "registry.conarx.tech/containers/nginx-php/edge" # Copy in built binaries -- GitLab