migrate to modulemd-packager

also remove old cruft

Signed-off-by: Felix Kaechele <felix@kaechele.ca>
This commit is contained in:
Felix Kaechele 2022-06-03 12:01:58 -04:00
commit 1eba9c71f9
5 changed files with 44 additions and 93 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,43 +1,45 @@
document: modulemd
version: 2
document: modulemd-packager
version: 3
data:
name: nginx
stream: mainline
summary: nginx webserver
description: nginx mainline webserver module
license:
module: [ MIT ]
dependencies:
- buildrequires:
platform: []
requires:
platform: []
references:
documentation: http://nginx.org/en/docs/
tracker: https://trac.nginx.org/nginx/
profiles:
common:
rpms:
- nginx
- nginx-mod-http-image-filter
- nginx-mod-http-perl
- nginx-mod-http-xslt-filter
- nginx-mod-mail
- nginx-mod-stream
- nginx-filesystem
- nginx-all-modules
api:
rpms:
- nginx
- nginx-mod-http-image-filter
- nginx-mod-http-perl
- nginx-mod-http-xslt-filter
- nginx-mod-mail
- nginx-mod-stream
- nginx-filesystem
- nginx-all-modules
components:
rpms:
nginx:
rationale: Module API.
ref: stream-mainline
summary: nginx webserver
description: nginx webserver mainline stream
license:
- MIT
configurations:
- context: "8b234a03"
platform: eln
- context: "9edba152"
platform: el8
- context: "f27b74a8"
platform: f35
- context: "5e5ad4a0"
platform: f36
- context: "9e842022"
platform: f37
references:
documentation: http://nginx.org/en/docs/
tracker: https://trac.nginx.org/nginx/
profiles:
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: nginx package
ref: stream-mainline

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