Compare commits

...
Sign in to create a new pull request.

45 commits

Author SHA1 Message Date
Petr Písař
316deb48d3 Remove a context for Fedora 35 2023-02-14 14:15:06 +01:00
Petr Písař
267c831d98 Add a context for Fedora 39 2023-02-14 14:14:27 +01:00
Felix Kaechele
a9d4181f45 backport fix for CVE-2022-41741 and CVE-2022-41742
Signed-off-by: Felix Kaechele <felix@kaechele.ca>
2022-11-10 12:13:37 -05:00
Petr Písař
34621e4545 Add a context for Fedora 38 2022-08-16 14:24:05 +02:00
Fedora Release Engineering
ec8bffb865 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-08-10 16:47:28 +00:00
463ba509ec migrate to modulemd-packager
also remove stale tests

Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2022-06-03 11:45:34 -04:00
b5cf1647f6 Sync with last 1.20 RPM release
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2022-06-03 11:01:31 -04:00
72ba87cd0f Do not build for EL8
EL8 has it's own 1.20 stream

Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2022-01-19 11:45:16 -05:00
6aaf1e591f Update to 1.20.2
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2021-12-21 15:02:38 +01:00
fa555f6a56 Sync 1.20 stream with main
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2021-10-18 19:05:24 -04:00
16434df23e Sync 1.20 stream with main
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2021-09-08 14:54:33 -04:00
bb1a5e32ca fix for CVE-2021-3618 (rhbz#1975651)
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2021-06-24 21:46:43 -04:00
2db36b997b Push permissions fix for 1.20.1
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2021-06-01 20:18:15 -04:00
bc34923895 update to 1.20.1
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2021-05-25 12:23:14 -04:00
f68186efff create 1.20 stream
build for EPEL8 as well

Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2021-04-21 14:51:10 -04:00
Fedora Release Engineering
f24dff7b21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-02-03 18:49:44 +00:00
Fedora Release Engineering
f05a0c7dbf Branching f33 from rawhide
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-19 20:05:59 +00:00
Fedora Release Engineering
8105bca205 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-08 09:59:57 +00:00
Stephen Gallagher
e5816af0a9
Do not build for EPEL 8. This stream is provided by RHEL 8
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2020-06-26 13:10:46 -04:00
58468d00f8 Create 1.18 stream
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2020-05-01 19:13:08 -04:00
a065141dbb update to 1.17.10
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2020-04-15 16:19:20 -04:00
8aa91020d1 update to 1.17.9
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2020-03-05 21:15:02 -05:00
Fedora Release Engineering
6a6fc06ff7 Branching f32 from rawhide
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-02-13 18:09:26 +00:00
Fedora Release Engineering
952fb8a15b - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-02-06 18:25:28 +00:00
df24325229 update to 1.17.8 2020-01-22 15:13:38 -05:00
a6ec0ec1fe remove mailcap dependency for EL 2020-01-20 10:28:35 -05:00
8e45eed80b 1.17.7 2019-12-27 11:47:41 +01:00
725dfb3a7e fix sources file 2019-11-19 22:27:51 -05:00
ce8f547877 1.17.6 2019-11-19 19:32:08 -05:00
ea628f2d57 1.17.5 2019-10-22 15:13:46 -04:00
af96a8c5bc 1.17.4 2019-09-25 12:23:46 -04:00
924abe06db 1.17.3 2019-08-16 11:33:53 -04:00
Fedora Release Engineering
041e89cfde Branching f31 from rawhide
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-08-13 19:58:56 +00:00
Fedora Release Engineering
fbaec0b099 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-08-12 15:02:30 +00:00
bced01ea08 update 2019-07-23 22:54:24 -04:00
007a48ee4e Enable build on all Fedora releases 2019-07-11 12:02:23 -04:00
Lubos Uhliarik
874f02e92d Add module name and branch name to yaml file 2019-06-04 12:25:41 +02:00
a5f7be7fa8 new branch for mainline
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
2019-06-03 11:50:10 -04:00
Lubos Uhliarik
cc67efb9ca Update module description and component stream. 2019-05-29 16:00:33 +02:00
Lubos Uhliarik
c26170f23c updated nginx.yaml file. Changed profile name from default to common. Build on f31 only. 2019-05-29 13:40:29 +02:00
Lubos Uhliarik
54c81875cc new branch for stream-1.14 2018-08-10 07:44:18 +00:00
Lubos Uhliarik
eadc7ab4e5 Updated module - merged with master (python dependency, disable GeoIP..) 2018-08-10 07:35:07 +00:00
Lubos Uhliarik
e40f03de14 Fix indent in yaml 2018-05-23 11:12:57 +00:00
Lubos Uhliarik
4da90d45b6 Changed modulemd version 2018-05-23 11:08:48 +00:00
Lubos Uhliarik
edf2779f23 Updated modulemd, completely rewriten 2018-05-23 09:53:19 +00:00
5 changed files with 44 additions and 103 deletions

View file

@ -1,15 +0,0 @@
IMAGE_NAME = nginx
MODULEMDURL=file://nginx.yaml
default: run
build:
docker build --tag=$(IMAGE_NAME) .
run: build
docker run -d $(IMAGE_NAME)
test: build
cd tests; MODULE=docker MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all
cd tests; MODULE=rpm MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all

View file

@ -1,53 +1,45 @@
document: modulemd document: modulemd-packager
version: 1 version: 3
data: data:
summary: nginx webserver summary: nginx webserver
description: an initial version of the nginx webserver module description: nginx webserver 1.20 stream
license: license:
module: [ MIT ] - MIT
dependencies: configurations:
buildrequires: - context: "8b234a03"
base-runtime: master platform: eln
requires: - context: "5e5ad4a0"
base-runtime: master platform: f36
references: - context: "9e842022"
community: https://docs.pagure.org/modularity/ platform: f37
documentation: https://github.com/container-images/nginx - context: "f38"
tracker: https://github.com/container-images/nginx platform: f38
profiles: - context: "f39"
default: platform: f39
rpms: references:
- nginx documentation: http://nginx.org/en/docs/
api: tracker: https://trac.nginx.org/nginx/
rpms: profiles:
- nginx common:
components: rpms:
rpms: - nginx
nginx: - nginx-all-modules
rationale: Provides API for this module. minimal:
ref: f26 rpms:
- nginx-core
gperftools: api:
rationale: dependency rpms:
ref: f26 - nginx
libmnl: - nginx-all-modules
rationale: dependency - nginx-core
ref: f26 - nginx-filesystem
libnetfilter_conntrack: - nginx-mod-http-image-filter
rationale: dependency - nginx-mod-http-perl
ref: f26 - nginx-mod-http-xslt-filter
libnfnetlink: - nginx-mod-mail
rationale: dependency - nginx-mod-stream
ref: f26 components:
libunwind: rpms:
rationale: dependency nginx:
ref: f26 rationale: nginx package
libxkbcommon: ref: stream-1.20
rationale: dependency
ref: f26
mailcap:
rationale: dependency
ref: f26
xkeyboard-config:
rationale: dependency
ref: f26

View file

View file

@ -1,7 +0,0 @@
MODULE_LINT=/usr/share/moduleframework/tools/modulelint.py
CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py
#
all:
generator
$(CMD)

View file

@ -1,29 +0,0 @@
document: modularity-testing
version: 1
name: nginx
modulemd-url: http://raw.githubusercontent.com/container-images/nginx/master/nginx.yaml
service:
port: 80
packages:
rpms:
- nginx
testdependecies:
rpms:
- curl
module:
docker:
start: "docker run --rm -p 80:80 nginx"
source: https://github.com/container-images/nginx.git
container: docker.io/modularitycontainers/nginx
rpm:
start: systemctl start nginx
stop: systemctl stop nginx
status: systemctl status nginx
repos:
- http://mirror.vutbr.cz/fedora/releases/25/Everything/x86_64/os/
test:
processrunning:
- 'ls /proc/*/exe -alh | grep nginx'
testhost:
basic:
- 'curl localhost | grep "Welcome to nginx!"'