commit 7b3cd2d226d9d5f0804b38f0780edc3fe4f5116fcdaa52529ee401e452c03629 Author: Thorsten Kukuk Date: Fri Apr 9 14:31:14 2021 +0000 Accepting request 884079 from home:brunoleon:branches:openSUSE:Templates:Images:Tumbleweed Remove unrelated entries from changes file OBS-URL: https://build.opensuse.org/request/show/884079 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/httpd-image?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ea543e1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,27 @@ +# Defines the tag for OBS and build script builds: +#!BuildTag: opensuse/httpd:latest +#!BuildTag: opensuse/httpd:%%MINOR%% +#!BuildTag: opensuse/httpd:%%PKG_VERSION%% +#!BuildTag: opensuse/httpd:%%PKG_VERSION%%-%RELEASE% + +FROM opensuse/tumbleweed + +# labelprefix=org.opensuse.httpd +PREFIXEDLABEL org.opencontainers.image.title="Apache httpd container" +PREFIXEDLABEL org.opencontainers.image.description="Apache httpd container" +PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%" +PREFIXEDLABEL org.opencontainers.image.version="%%PKG_VERSION%%-%RELEASE%" +PREFIXEDLABEL org.opencontainers.image.vendor="openSUSE Project" +PREFIXEDLABEL org.openbuildservice.disturl="%DISTURL%" +PREFIXEDLABEL org.opensuse.reference="registry.opensuse.org/opensuse/httpd:%%PKG_VERSION%%-%RELEASE%" + +RUN zypper install -y --no-recommends apache2 && \ + zypper clean + +# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop +STOPSIGNAL SIGWINCH + +VOLUME /srv/www/htdocs + +EXPOSE 80 +ENTRYPOINT ["httpd", "-DFOREGROUND"] diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2b62e4c --- /dev/null +++ b/LICENSE @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/_service b/_service new file mode 100644 index 0000000..154c79c --- /dev/null +++ b/_service @@ -0,0 +1,30 @@ + + + + + git + https://github.com/openSUSE/container-images.git + main + http + Dockerfile + enable + + + git + https://github.com/openSUSE/container-images.git + main + LICENCE + + + Dockerfile + %%PKG_VERSION%% + patch + apache2 + + + Dockerfile + %%MINOR%% + minor + apache2 + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..c1a7927 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/container-images.git + cb3691c2f8ef2d5ff605304fc6bce7a6455c5613 \ No newline at end of file diff --git a/httpd-image.changes b/httpd-image.changes new file mode 100644 index 0000000..544399c --- /dev/null +++ b/httpd-image.changes @@ -0,0 +1,13 @@ +------------------------------------------------------------------- +Thu Apr 08 09:37:09 UTC 2021 - bruno.leon@suse.com + +- Update to version 1617872371.cb3691c: + * httpd: add labelprefix + * httpd: explicitely install apache2 pkg + * httpd: fix zypper clean call + * httpd: add vendor label + +------------------------------------------------------------------- +Mon Mar 29 08:35:46 UTC 2021 - Bruno Leon + +- Initial release