update to 1.25.4

- drop obsolete and retired targets

Signed-off-by: Felix Kaechele <felix@kaechele.ca>

Makefile

@@ -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

nginx.yaml

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

tests/Makefile

@@ -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)

tests/config.yaml

@@ -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!"'