Skip to content

Commit

Permalink
Replacing "container" with "image"
Browse files Browse the repository at this point in the history
  • Loading branch information
howardroark committed Apr 2, 2018
1 parent 01d70b5 commit 1bfe968
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion tests/mocks/data-complete.json
@@ -1,6 +1,6 @@
{
"name": "data-complete",
"container": "debian",
"image": "debian",
"discard": [
"README.md"
],
Expand Down
2 changes: 1 addition & 1 deletion tests/mocks/data-no-discard.json
@@ -1,6 +1,6 @@
{
"name": "data-no-discard",
"container": "debian",
"image": "debian",
"parse": [
"Dockerfile",
"PROJECT-README"
Expand Down
2 changes: 1 addition & 1 deletion tests/mocks/data-no-move.json
@@ -1,6 +1,6 @@
{
"name": "data-no-move",
"container": "debian",
"image": "debian",
"discard": [
"README.md"
],
Expand Down
2 changes: 1 addition & 1 deletion tests/mocks/data-parse-all.json
@@ -1,6 +1,6 @@
{
"name": "data-parse-all",
"container": "debian",
"image": "debian",
"parse":["**"],
"discard": [
"README.md"
Expand Down
2 changes: 1 addition & 1 deletion tests/mocks/data.json
@@ -1,4 +1,4 @@
{
"name": "newproject",
"container":"alpine"
"image":"alpine"
}
2 changes: 1 addition & 1 deletion tests/mocks/template-no-data/Dockerfile
@@ -1 +1 @@
FROM {{ container }}
FROM {{ image }}
2 changes: 1 addition & 1 deletion tests/mocks/template/Dockerfile
@@ -1 +1 @@
FROM {{ container }}
FROM {{ image }}
2 changes: 1 addition & 1 deletion tests/mocks/template/template.json
@@ -1,6 +1,6 @@
{
"name": "newproject",
"container": "debian",
"image": "debian",
"discard": [
"README.md",
"template.json"
Expand Down
14 changes: 7 additions & 7 deletions tests/test.js
Expand Up @@ -18,7 +18,7 @@ describe('Test basic example', function () {
pollinate({
"inputs": [
"howardroark/webapp",
"{\"name\":\"newproject\",\"container\":\"alpine\"}"
"{\"name\":\"newproject\",\"image\":\"alpine\"}"
],
"options": {
//..
Expand Down Expand Up @@ -67,7 +67,7 @@ describe('Test basic example', function () {
pollinate({
"inputs": [
"https://github.com/howardroark/webapp.git",
"{\"name\":\"newproject\",\"container\":\"alpine\"}"
"{\"name\":\"newproject\",\"image\":\"alpine\"}"
],
"options": {
//..
Expand All @@ -82,7 +82,7 @@ describe('Test basic example', function () {
pollinate({
"inputs": [
"https://github.com/howardroark/webapp.git",
"{\"name\":\"newproject\",\"container\":\"alpine\", \"keepHistory\":true}"
"{\"name\":\"newproject\",\"image\":\"alpine\", \"keepHistory\":true}"
],
"options": {
//..
Expand All @@ -101,7 +101,7 @@ describe('Test basic example', function () {
pollinate({
"inputs": [
"https://github.com/howardroark/webapp.git",
"{\"name\":\"newproject\",\"container\":\"alpine\"}"
"{\"name\":\"newproject\",\"image\":\"alpine\"}"
],
"options": {
//..
Expand All @@ -126,7 +126,7 @@ describe('Test basic example', function () {
],
"options": {
"name": "test",
"container": "ubuntu"
"image": "ubuntu"
}
}, function (err, result) {
assert.isNull(err);
Expand All @@ -138,7 +138,7 @@ describe('Test basic example', function () {
pollinate({
"inputs": [
"howardroark/webapp#test-branch",
"{\"name\":\"newproject\",\"container\":\"alpine\"}"
"{\"name\":\"newproject\",\"image\":\"alpine\"}"
],
"options": {
//..
Expand All @@ -157,7 +157,7 @@ describe('Test basic example', function () {
pollinate({
"inputs": [
"https://github.com/howardroark/webapp.git#test-branch",
"{\"name\":\"newproject\",\"container\":\"alpine\"}"
"{\"name\":\"newproject\",\"image\":\"alpine\"}"
],
"options": {
//..
Expand Down

0 comments on commit 1bfe968

Please sign in to comment.