From 907d745a903dad50e8897f29d950808e129e08ec Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Thu, 11 May 2017 13:32:57 +0200 Subject: [PATCH 01/18] finish modulemd Signed-off-by: Tomas Tomecek --- nodejs.yaml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 0e26ef5..1aadbc9 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -1,13 +1,19 @@ data: - api: - rpms: - - nodejs + api: + rpms: + - nodejs + dependencies: + buildrequires: + base-runtime: f26 + shared-userspace: f26 + requires: + shared-userspace: f26 + base-runtime: f26 components: rpms: - compat-openssl10: {rationale: Build dependency.} - gcc: {rationale: Build dependency.} - icu: {rationale: Build dependency.} - libuv: {rationale: Build and runtime dependency.} + nodejs: + rationale: "Primary package" + ref: f26 description: 'Node.js is a platform built on Chrome''s JavaScript runtime for easily building fast, scalable network applications. @@ -20,9 +26,6 @@ data: filter: {} license: module: [MIT and ASL 2.0 and ISC and BSD] - name: '' - stream: '' summary: JavaScript runtime - version: 0 document: modulemd version: 1 From 825b23f1961cd9929ab3711c28afeac30655ae96 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Thu, 11 May 2017 14:43:20 +0200 Subject: [PATCH 02/18] use modulemd from rpms/nodejs/nodejs.yaml Signed-off-by: Tomas Tomecek --- nodejs.yaml | 73 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 1aadbc9..c32fe77 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -1,31 +1,46 @@ -data: - api: - rpms: - - nodejs - dependencies: - buildrequires: - base-runtime: f26 - shared-userspace: f26 - requires: - shared-userspace: f26 - base-runtime: f26 - components: - rpms: - nodejs: - rationale: "Primary package" - ref: f26 - description: 'Node.js is a platform built on Chrome''s JavaScript runtime - - for easily building fast, scalable network applications. - - Node.js uses an event-driven, non-blocking I/O model that - - makes it lightweight and efficient, perfect for data-intensive - - real-time applications that run across distributed devices.' - filter: {} - license: - module: [MIT and ASL 2.0 and ISC and BSD] - summary: JavaScript runtime document: modulemd version: 1 +data: + summary: Javascript runtime + description: 'Node.js is a platform built on Chrome''s JavaScript runtime + for easily building fast, scalable network applications. + Node.js uses an event-driven, non-blocking I/O model that + makes it lightweight and efficient, perfect for data-intensive + real-time applications that run across distributed devices.' + license: + module: GPLv3 + content: + - MIT + - ASL 2.0 + - ISC + - BSD + dependencies: + buildrequires: + base-runtime: f26 + shared-userspace: f26 + requires: + base-runtime: f26 + shared-userspace: f26 + references: + community: https://fedoraproject.org/wiki/Modularity + documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules + tracker: https://taiga.fedorainfracloud.org/project/modularity + profiles: + default: + rpms: + - nodejs + - npm + minimal: + rpms: + - nodejs + components: + rpms: + nodejs: + rationale: JavaScript runtime + # commit from f26 which enables bootstrapping + ref: b0da67b00a92f2ad570d91d6f50fb9b1786650c9 + buildorder: 0 + npm: + rationale: npm package manager + ref: f26 + buildorder: 1 From fe98ae5a27840297f57f6ee40da5cbba42cce022 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Fri, 12 May 2017 10:59:53 +0200 Subject: [PATCH 03/18] finish mmd: add api, remove npm (built from nodejs) Signed-off-by: Tomas Tomecek --- nodejs.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index c32fe77..86b721b 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -33,6 +33,10 @@ data: minimal: rpms: - nodejs + api: + rpms: + - npm + - nodejs components: rpms: nodejs: @@ -40,7 +44,3 @@ data: # commit from f26 which enables bootstrapping ref: b0da67b00a92f2ad570d91d6f50fb9b1786650c9 buildorder: 0 - npm: - rationale: npm package manager - ref: f26 - buildorder: 1 From 79ee01ba5b7c7ed5af9b28be46642e91401b2220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 24 May 2017 09:50:17 +0200 Subject: [PATCH 04/18] Rebuilding for f26 signing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata From 09ecf0e27c04dafee8c3657ed3ca9f3394afb8f5 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 6 Jun 2017 14:42:14 +0200 Subject: [PATCH 05/18] 6.10.2 build for update demo please do NOT build this in infra Signed-off-by: Tomas Tomecek --- nodejs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs.yaml b/nodejs.yaml index 86b721b..91d068c 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -42,5 +42,5 @@ data: nodejs: rationale: JavaScript runtime # commit from f26 which enables bootstrapping - ref: b0da67b00a92f2ad570d91d6f50fb9b1786650c9 + ref: 7f7badf0adcb2672ff6375465ccf01b3a1575f3c buildorder: 0 From 049473928aa49a6d4357a0f542efa7ce58f048ee Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Wed, 7 Jun 2017 14:13:32 +0200 Subject: [PATCH 06/18] Revert "6.10.2 build for update demo" This reverts commit 09ecf0e27c04dafee8c3657ed3ca9f3394afb8f5. --- nodejs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs.yaml b/nodejs.yaml index 91d068c..86b721b 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -42,5 +42,5 @@ data: nodejs: rationale: JavaScript runtime # commit from f26 which enables bootstrapping - ref: 7f7badf0adcb2672ff6375465ccf01b3a1575f3c + ref: b0da67b00a92f2ad570d91d6f50fb9b1786650c9 buildorder: 0 From 943bed62f1ae06e7e35443756547fd0210f637cd Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 9 Jun 2017 10:41:43 +0200 Subject: [PATCH 07/18] First set of tests. Signed-off-by: Petr "Stone" Hracek --- .gitignore | 1 + Dockerfile | 25 +++++++++++++++ Makefile | 16 ++++++++++ repos/nodejs.repo | 6 ++++ tests/Makefile | 6 ++++ tests/config.yaml | 26 ++++++++++++++++ tests/resources/hello.txt | 1 + tests/resources/server1.js | 13 ++++++++ tests/resources/server2.js | 27 ++++++++++++++++ tests/sanity_check.py | 63 ++++++++++++++++++++++++++++++++++++++ 10 files changed, 184 insertions(+) create mode 100644 Dockerfile create mode 100644 Makefile create mode 100644 repos/nodejs.repo create mode 100644 tests/Makefile create mode 100644 tests/config.yaml create mode 100644 tests/resources/hello.txt create mode 100644 tests/resources/server1.js create mode 100644 tests/resources/server2.js create mode 100644 tests/sanity_check.py diff --git a/.gitignore b/.gitignore index e69de29..c2956c7 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +*.py[oc] diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..12cf904 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,25 @@ +FROM baseruntime/baseruntime:latest + +ENV NAME=nodejs \ + VERSION=0 \ + RELEASE=1 \ + ARCH=x86_64 + +LABEL summary="Javascript runtime." \ + name="$FGC/$NAME" \ + version="$VERSION" \ + release="$RELEASE.$DISTTAG" \ + architecture="$ARCH" \ + usage="docker run nodejs node" \ + description="Node.js is a platform built on V8 JavaScript Engine for easily building fast, scalable network applications." \ + io.k8s.description="Node.js is a platform built on V8 JavaScript Engine for easily building fast, scalable network applications." + + +COPY repos/* /etc/yum.repos.d/ + +RUN sed -i 's|/jkaluza/|/ralph/|g' /etc/yum.repos.d/build.repo && \ + microdnf --nodocs --enablerepo nodejs install nodejs npm + +EXPOSE 8080 + +CMD /bin/sh/ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..3d9a1b8 --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +IMAGE_NAME=nodejs + +MODULEMDURL=http://pkgs.fedoraproject.org/cgit/modules/nodejs.git/plain/nodejs.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) make all + diff --git a/repos/nodejs.repo b/repos/nodejs.repo new file mode 100644 index 0000000..2b6bfaf --- /dev/null +++ b/repos/nodejs.repo @@ -0,0 +1,6 @@ +[nodejs] +name=nodejs +baseurl=https://kojipkgs.fedoraproject.org/compose/latest-Fedora-Modular-26/compose/Server/x86_64/os/ +enabled=0 +gpgcheck=false +modules=1 diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..8fd8ae7 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,6 @@ +MODULE_LINT=/usr/share/moduleframework/tools/modulelint.py +CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py + +# +all: + $(CMD) diff --git a/tests/config.yaml b/tests/config.yaml new file mode 100644 index 0000000..ab3b041 --- /dev/null +++ b/tests/config.yaml @@ -0,0 +1,26 @@ +document: modularity-testing +version: 1 +name: nodejs +modulemd-url: http://pkgs.fedoraproject.org/cgit/modules/nodejs.git/plain/nodejs.yaml +service: + port: 8080 +packages: + rpms: + - nodejs + - npm +testdependecies: + rpms: + - curl +module: + docker: + start: "docker run -itd -u=0 --entrypoint /usr/bin/bash -p 8080:8080" + labels: + description: "Node.js is a platform built on V8 JavaScript Engine for easily building fast, scalable network applications." + io.k8s.description: "Node.js is a platform built on V8 JavaScript Engine for easily building fast, scalable network applications." + source: https://github.com/container-images/nodejs + container: docker.io/modularitycontainers/nodejs + rpm: + start: bash + stop: "forever stopall" + repos: + - http://mirror.vutbr.cz/fedora/releases/26/Everything/x86_64/os/ diff --git a/tests/resources/hello.txt b/tests/resources/hello.txt new file mode 100644 index 0000000..cd08755 --- /dev/null +++ b/tests/resources/hello.txt @@ -0,0 +1 @@ +Hello world! diff --git a/tests/resources/server1.js b/tests/resources/server1.js new file mode 100644 index 0000000..993b51b --- /dev/null +++ b/tests/resources/server1.js @@ -0,0 +1,13 @@ +const http = require('http'); + +const port = 8080; + +const server = http.createServer((req, res) => { + res.statusCode = 200; + res.setHeader('Content-Type', 'text/plain'); + res.end('Hello World\n'); +}); + +server.listen(port, () => { + console.log(`Server running at http://127.0.0.1:${port}/`); +}); diff --git a/tests/resources/server2.js b/tests/resources/server2.js new file mode 100644 index 0000000..67cab3f --- /dev/null +++ b/tests/resources/server2.js @@ -0,0 +1,27 @@ +const http = require('http'); +const fs = require('fs'); + +const port = 8080; + +string = "ERROR" + +fs.readFile('/tmp/test/hello.txt','utf-8', function (err,data) { + if (err) { + console.log("Error"); + } + else + { + string = data; + + } + +}); +const server = http.createServer((req, res) => { + res.statusCode = 200; + res.setHeader('Content-Type', 'text/plain'); + res.end(string); +}); + +server.listen(port, () => { + console.log(`Server running at http://127.0.0.1:${port}/`); +}); diff --git a/tests/sanity_check.py b/tests/sanity_check.py new file mode 100644 index 0000000..6b3aaa4 --- /dev/null +++ b/tests/sanity_check.py @@ -0,0 +1,63 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# This Modularity Testing Framework helps you to write tests for modules +# Copyright (C) 2017 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# he Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Authors: Jan Koscielniak +# +import socket +from avocado import main +from avocado.core import exceptions +from moduleframework import module_framework +import urllib, os, time + + +class SanityCheckTemplate(module_framework.AvocadoTest): + """ + :avocado: enable + """ + def setUp(self): + super(self.__class__, self).setUp() + self.start() + self.run("mkdir -p /tmp/test") + self.run('cd /tmp/test/ && npm install -g forever') + + def testServer(self): + self.copyTo(os.path.abspath("resources/server1.js"), "/tmp/test/server1.js") + self.run('cd /tmp/test/ && forever start server1.js') + time.sleep(2) + conn = urllib.urlopen("http://127.0.0.1:8080") + code = conn.getcode() + print ">>> Testing a simple server" + print ">>> Returned code: " + str(code) + assert code == 200 + + def testSyscall(self): + self.copyTo(os.path.abspath("resources/server2.js"), "/tmp/test/server2.js") + self.copyTo(os.path.abspath("resources/hello.txt"), "/tmp/test/hello.txt") + self.run('cd /tmp/test/ && npm install -g fs') + self.run('cd /tmp/test/ && forever start server2.js') + time.sleep(2) + conn = urllib.urlopen("http://127.0.0.1:8080") + response = conn.read() + print ">>> Response: " + response + assert response == "Hello world!" + +if __name__ == '__main__': + main() + From 15947cc35f1fa98b0ef4bbb23f69523285fdf229 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 12 Jun 2017 14:01:23 +0200 Subject: [PATCH 08/18] Update Dockerfile repo and tests Signed-off-by: Petr "Stone" Hracek --- Dockerfile | 5 +---- repos/nodejs.repo | 6 ------ tests/config.yaml | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 repos/nodejs.repo diff --git a/Dockerfile b/Dockerfile index 12cf904..26ac3fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,10 +15,7 @@ LABEL summary="Javascript runtime." \ io.k8s.description="Node.js is a platform built on V8 JavaScript Engine for easily building fast, scalable network applications." -COPY repos/* /etc/yum.repos.d/ - -RUN sed -i 's|/jkaluza/|/ralph/|g' /etc/yum.repos.d/build.repo && \ - microdnf --nodocs --enablerepo nodejs install nodejs npm +RUN microdnf --nodocs install nodejs npm EXPOSE 8080 diff --git a/repos/nodejs.repo b/repos/nodejs.repo deleted file mode 100644 index 2b6bfaf..0000000 --- a/repos/nodejs.repo +++ /dev/null @@ -1,6 +0,0 @@ -[nodejs] -name=nodejs -baseurl=https://kojipkgs.fedoraproject.org/compose/latest-Fedora-Modular-26/compose/Server/x86_64/os/ -enabled=0 -gpgcheck=false -modules=1 diff --git a/tests/config.yaml b/tests/config.yaml index ab3b041..518482c 100644 --- a/tests/config.yaml +++ b/tests/config.yaml @@ -13,7 +13,7 @@ testdependecies: - curl module: docker: - start: "docker run -itd -u=0 --entrypoint /usr/bin/bash -p 8080:8080" + start: "docker run -td -u=0 --entrypoint /usr/bin/bash -p 8080:8080" labels: description: "Node.js is a platform built on V8 JavaScript Engine for easily building fast, scalable network applications." io.k8s.description: "Node.js is a platform built on V8 JavaScript Engine for easily building fast, scalable network applications." From 94e51d313ece083b6a554c3ee732fd7c3e68b330 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Fri, 16 Jun 2017 11:48:12 +0200 Subject: [PATCH 09/18] Add nodejs-packaging dependency --- nodejs.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nodejs.yaml b/nodejs.yaml index 86b721b..e6354e7 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -44,3 +44,6 @@ data: # commit from f26 which enables bootstrapping ref: b0da67b00a92f2ad570d91d6f50fb9b1786650c9 buildorder: 0 + nodejs-packaging: + rationale: packaging macros for nodejs + ref: 037154a07e3fec45be281d29831d0b52e836bcce From b685141833c267a6830d70ddfd401cf57685e31f Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 2 Aug 2017 11:00:13 +0200 Subject: [PATCH 10/18] update references --- nodejs.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index e6354e7..d0d5c80 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -22,9 +22,9 @@ data: base-runtime: f26 shared-userspace: f26 references: - community: https://fedoraproject.org/wiki/Modularity - documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules - tracker: https://taiga.fedorainfracloud.org/project/modularity + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/nodejs + tracker: https://github.com/modularity-modules/nodejs profiles: default: rpms: From e5899f64e52d4f4f0d182b5765533b49dd523154 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Wed, 20 Sep 2017 15:43:16 +0200 Subject: [PATCH 11/18] Fix yaml --- nodejs.yaml | 72 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 20 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 0e26ef5..6482806 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -1,14 +1,8 @@ +document: modulemd +version: 1 data: - api: - rpms: - - nodejs - components: - rpms: - compat-openssl10: {rationale: Build dependency.} - gcc: {rationale: Build dependency.} - icu: {rationale: Build dependency.} - libuv: {rationale: Build and runtime dependency.} - description: 'Node.js is a platform built on Chrome''s JavaScript runtime + summary: Javascript runtime + description: Node.js is a platform built on Chrome''s JavaScript runtime for easily building fast, scalable network applications. @@ -16,13 +10,51 @@ data: makes it lightweight and efficient, perfect for data-intensive - real-time applications that run across distributed devices.' - filter: {} - license: - module: [MIT and ASL 2.0 and ISC and BSD] - name: '' - stream: '' - summary: JavaScript runtime - version: 0 -document: modulemd -version: 1 + real-time applications that run across distributed devices. + license: + module: MIT + content: [MIT and ASL 2.0 and ISC and BSD] + dependencies: + buildrequires: + # http-parser, libuv, c-ares and V8 are bundled + # icu and zlib should be provided by platform + platform: master + compat-openssl10: master + requires: + platform: master + compat-openssl10: master + references: + community: http://nodejs.org + documentation: http://nodejs.org/en/docs + github: http://github.com/nodejs/node + npm: http://npmjs.com + profiles: + default: + rpms: + - nodejs + - npm + development: + rpms: + - nodejs + - nodejs-devel + - npm + minimal: + rpms: + - nodejs + api: + rpms: + - nodejs + - nodejs-devel + - npm + components: + rpms: + nodejs: + rationale: Javascript runtime. + buildorder: 10 + ref: d54471 + npm: + rationale: npm package manager. + buildorder: 20 + nodejs-packaging: + rationale: Runtime dependency of nodejs-devel. + buildorder: 10 From afb156364a61f3846cee6400f2df8859a6cd8e67 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Wed, 20 Sep 2017 15:47:05 +0200 Subject: [PATCH 12/18] Fix description --- nodejs.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 6482806..c81cc8f 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -3,13 +3,9 @@ version: 1 data: summary: Javascript runtime description: Node.js is a platform built on Chrome''s JavaScript runtime - for easily building fast, scalable network applications. - Node.js uses an event-driven, non-blocking I/O model that - makes it lightweight and efficient, perfect for data-intensive - real-time applications that run across distributed devices. license: module: MIT From 6816f3148fe32e313fe48a66cd0aad6c31a2370d Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Wed, 20 Sep 2017 15:49:33 +0200 Subject: [PATCH 13/18] Fix description --- nodejs.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index c81cc8f..e6ea357 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -2,11 +2,12 @@ document: modulemd version: 1 data: summary: Javascript runtime - description: Node.js is a platform built on Chrome''s JavaScript runtime - for easily building fast, scalable network applications. - Node.js uses an event-driven, non-blocking I/O model that - makes it lightweight and efficient, perfect for data-intensive - real-time applications that run across distributed devices. + description: >- + Node.js is a platform built on Chrome''s JavaScript runtime + for easily building fast, scalable network applications. + Node.js uses an event-driven, non-blocking I/O model that + makes it lightweight and efficient, perfect for data-intensive + real-time applications that run across distributed devices. license: module: MIT content: [MIT and ASL 2.0 and ISC and BSD] From 05380af1a85ffcee5a140d0b0a9e487f825bb19d Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Wed, 20 Sep 2017 17:03:42 +0200 Subject: [PATCH 14/18] Remove nodejs licenses and openssl dependency --- nodejs.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index e6ea357..f6e72b4 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -10,16 +10,13 @@ data: real-time applications that run across distributed devices. license: module: MIT - content: [MIT and ASL 2.0 and ISC and BSD] dependencies: buildrequires: # http-parser, libuv, c-ares and V8 are bundled - # icu and zlib should be provided by platform + # openssl, icu and zlib should be provided by platform platform: master - compat-openssl10: master requires: platform: master - compat-openssl10: master references: community: http://nodejs.org documentation: http://nodejs.org/en/docs From 02400daa62b27b3abae4d2901a069d27f865306f Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 21 Sep 2017 11:01:56 +0200 Subject: [PATCH 15/18] Add python2 dependency --- nodejs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nodejs.yaml b/nodejs.yaml index f6e72b4..4f5ef6d 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -15,8 +15,10 @@ data: # http-parser, libuv, c-ares and V8 are bundled # openssl, icu and zlib should be provided by platform platform: master + python2: master requires: platform: master + python2: master references: community: http://nodejs.org documentation: http://nodejs.org/en/docs From ae3c992f7cc00131b2cd8297ef1b03de92fc773b Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Fri, 22 Sep 2017 15:43:39 +0200 Subject: [PATCH 16/18] Rebuild with new python2 build From 60be7b9df440f1ba25f0a21272988094e59af414 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Mon, 25 Sep 2017 09:33:59 +0200 Subject: [PATCH 17/18] Remove npm from components --- nodejs.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 4f5ef6d..f851ef1 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -45,12 +45,9 @@ data: components: rpms: nodejs: - rationale: Javascript runtime. + rationale: Javascript runtime and npm package manager. buildorder: 10 ref: d54471 - npm: - rationale: npm package manager. - buildorder: 20 nodejs-packaging: rationale: Runtime dependency of nodejs-devel. buildorder: 10 From 1fe678af1b8893cf73513027a23a2ff5b84dfb89 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 21 Jun 2018 10:27:57 -0400 Subject: [PATCH 18/18] Master branch is not used for modules --- .gitignore | 0 README.md | 13 ------------- dead.package | 1 + nodejs.yaml | 53 ---------------------------------------------------- sources | 0 5 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md create mode 100644 dead.package delete mode 100644 nodejs.yaml delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/README.md b/README.md deleted file mode 100644 index 0b7e42a..0000000 --- a/README.md +++ /dev/null @@ -1,13 +0,0 @@ -nodejs dependencies -==================== - -build dependencies calculated by brt_dep_solver ------------------------------------------------ -compat-openssl10 -gcc -icu -libuv - -runtime dependencies calculated by brt_dep_solver -------------------------------------------------- -libuv diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5f8adfb --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Master branch is not used for modules diff --git a/nodejs.yaml b/nodejs.yaml deleted file mode 100644 index f851ef1..0000000 --- a/nodejs.yaml +++ /dev/null @@ -1,53 +0,0 @@ -document: modulemd -version: 1 -data: - summary: Javascript runtime - description: >- - Node.js is a platform built on Chrome''s JavaScript runtime - for easily building fast, scalable network applications. - Node.js uses an event-driven, non-blocking I/O model that - makes it lightweight and efficient, perfect for data-intensive - real-time applications that run across distributed devices. - license: - module: MIT - dependencies: - buildrequires: - # http-parser, libuv, c-ares and V8 are bundled - # openssl, icu and zlib should be provided by platform - platform: master - python2: master - requires: - platform: master - python2: master - references: - community: http://nodejs.org - documentation: http://nodejs.org/en/docs - github: http://github.com/nodejs/node - npm: http://npmjs.com - profiles: - default: - rpms: - - nodejs - - npm - development: - rpms: - - nodejs - - nodejs-devel - - npm - minimal: - rpms: - - nodejs - api: - rpms: - - nodejs - - nodejs-devel - - npm - components: - rpms: - nodejs: - rationale: Javascript runtime and npm package manager. - buildorder: 10 - ref: d54471 - nodejs-packaging: - rationale: Runtime dependency of nodejs-devel. - buildorder: 10 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000