Skip to content

Commit

Permalink
v0.0.37-RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexGilleran committed Mar 29, 2018
1 parent 5bf4433 commit cf800d0
Show file tree
Hide file tree
Showing 38 changed files with 211 additions and 288 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## 0.0.38

## 0.0.37

* Make search filter lozenges wrap when too long
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/magda-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ global:
rollingUpdate:
maxUnavailable: 1
image:
tag: "0.0.37-0"
tag: "0.0.37-RC1"

tags:
all: true
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/magda/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
description: "Next generation search and discovery for open data portals."
name: "magda"
version: "0.0.37-0"
version: "0.0.37-RC1"
home: "https://github.com/TerriaJS/magda"
sources: ["https://github.com/TerriaJS/magda"]
2 changes: 1 addition & 1 deletion deploy/helm/search-data-gov-au.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ global:
externalUrl: https://search.data.gov.au
image:
pullPolicy: IfNotPresent
tag: "0.0.36"
tag: "0.0.37-RC1"
tags:
all: false

Expand Down
22 changes: 8 additions & 14 deletions deploy/package.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,26 @@
{
"name": "@magda/deploy",
"version": "0.0.37-0",
"version": "0.0.37-RC1",
"description": "MAGDA deployment configuration.",
"scripts": {
"create-connector-configmap":
"kubectl delete configmap connector-config --ignore-not-found && kubectl create configmap connector-config --from-file ./connector-config/",
"generate-connector-jobs-local":
"generate-connector-jobs --in ./connector-config --out ./kubernetes/generated/local --local",
"generate-connector-jobs-dev":
"generate-connector-jobs --prod true --in ./connector-config --out ./kubernetes/generated/prod",
"generate-connector-jobs-prod":
"generate-connector-jobs --prod true --in ./connector-config --out ./kubernetes/generated/prod",
"create-config-configmap":
"kubectl delete configmap config --ignore-not-found && kubectl create configmap config --from-file ./kubernetes/config/"
"create-connector-configmap": "kubectl delete configmap connector-config --ignore-not-found && kubectl create configmap connector-config --from-file ./connector-config/",
"generate-connector-jobs-local": "generate-connector-jobs --in ./connector-config --out ./kubernetes/generated/local --local",
"generate-connector-jobs-dev": "generate-connector-jobs --prod true --in ./connector-config --out ./kubernetes/generated/prod",
"generate-connector-jobs-prod": "generate-connector-jobs --prod true --in ./connector-config --out ./kubernetes/generated/prod",
"create-config-configmap": "kubectl delete configmap config --ignore-not-found && kubectl create configmap config --from-file ./kubernetes/config/"
},
"author": "",
"license": "Apache-2.0",
"devDependencies": {
"@magda/scripts": "^0.0.37-0",
"@magda/scripts": "^0.0.37-RC1",
"fs-extra": "^2.1.2",
"klaw-sync": "^2.1.0",
"tmp": "0.0.31",
"yargs": "^8.0.1"
},
"bin": {
"generate-registry-typescript": "generate-registry-typescript.js",
"create-docker-context-for-node-component":
"create-docker-context-for-node-component.js",
"create-docker-context-for-node-component": "create-docker-context-for-node-component.js",
"generate-connector-jobs": "generate-connector-jobs.js"
}
}
68 changes: 34 additions & 34 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{
"lerna": "2.5.1",
"packages": [
"deploy/",
"magda-*",
"scripts/"
],
"version": "0.0.37-0",
"hoist": [
"tsmonad",
"urijs",
"@types/urijs",
"express",
"@types/express",
"@types/supertest",
"pretty-quick",
"prettier",
"eslint",
"eslint-plugin-prettier",
"eslint-plugin-import",
"eslint-plugin-flowtype",
"eslint-plugin-jsx-a11y",
"eslint-plugin-react",
"eslint-config-react-app",
"babel-eslint"
],
"commands": {
"docker-build-prod": {
"ignore": [
"magda-authorization-db",
"magda-discussions-db",
"magda-authorization-api",
"magda-discussions-api"
]
}
"lerna": "2.5.1",
"packages": [
"deploy/",
"magda-*",
"scripts/"
],
"version": "0.0.37-RC1",
"hoist": [
"tsmonad",
"urijs",
"@types/urijs",
"express",
"@types/express",
"@types/supertest",
"pretty-quick",
"prettier",
"eslint",
"eslint-plugin-prettier",
"eslint-plugin-import",
"eslint-plugin-flowtype",
"eslint-plugin-jsx-a11y",
"eslint-plugin-react",
"eslint-config-react-app",
"babel-eslint"
],
"commands": {
"docker-build-prod": {
"ignore": [
"magda-authorization-db",
"magda-discussions-db",
"magda-authorization-api",
"magda-discussions-api"
]
}
}
}
15 changes: 6 additions & 9 deletions magda-admin-api/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
{
"name": "@magda/admin-api",
"version": "0.0.37-0",
"version": "0.0.37-RC1",
"scripts": {
"build": "npm run compile",
"compile": "tsc -p tsconfig-build.json",
"watch": "tsc -p tsconfig-build.json --watch",
"start": "node dist/index.js",
"dev": "run-typescript-in-nodemon src/index.ts",
"docker-build-local":
"create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod":
"create-docker-context-for-node-component --build --push --tag auto",
"test":
"mocha --compilers ts:@magda/scripts/node_modules/ts-node/register --require @magda/scripts/node_modules/tsconfig-paths/register \"src/test/**/*.spec.ts\""
"docker-build-local": "create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod": "create-docker-context-for-node-component --build --push --tag auto",
"test": "mocha --compilers ts:@magda/scripts/node_modules/ts-node/register --require @magda/scripts/node_modules/tsconfig-paths/register \"src/test/**/*.spec.ts\""
},
"dependencies": {
"@magda/typescript-common": "^0.0.37-0",
"@magda/typescript-common": "^0.0.37-RC1",
"body-parser": "^1.13.2",
"express": "^4.13.1",
"http-proxy": "^1.16.2",
Expand All @@ -26,7 +23,7 @@
"yargs": "^8.0.2"
},
"devDependencies": {
"@magda/scripts": "^0.0.37-0",
"@magda/scripts": "^0.0.37-RC1",
"@types/chai": "^4.0.4",
"@types/config": "0.0.32",
"@types/express": "^4.0.35",
Expand Down
15 changes: 6 additions & 9 deletions magda-authorization-api/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
{
"name": "@magda/authorization-api",
"version": "0.0.37-0",
"version": "0.0.37-RC1",
"scripts": {
"build": "npm run compile",
"compile": "tsc -p tsconfig-build.json",
"watch": "tsc -p tsconfig-build.json --watch",
"start": "node dist/index.js",
"dev": "run-typescript-in-nodemon src/index.ts",
"test":
"mocha --compilers ts:@magda/scripts/node_modules/ts-node/register --require @magda/scripts/node_modules/tsconfig-paths/register \"src/test/**/*.spec.ts\"",
"docker-build-local":
"create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod":
"create-docker-context-for-node-component --build --push --tag auto"
"test": "mocha --compilers ts:@magda/scripts/node_modules/ts-node/register --require @magda/scripts/node_modules/tsconfig-paths/register \"src/test/**/*.spec.ts\"",
"docker-build-local": "create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod": "create-docker-context-for-node-component --build --push --tag auto"
},
"dependencies": {
"@magda/typescript-common": "^0.0.37-0",
"@magda/typescript-common": "^0.0.37-RC1",
"body-parser": "^1.13.2",
"express": "^4.13.1",
"jsonwebtoken": "^7.4.1",
Expand All @@ -24,7 +21,7 @@
"yargs": "^8.0.2"
},
"devDependencies": {
"@magda/scripts": "^0.0.37-0",
"@magda/scripts": "^0.0.37-RC1",
"@types/chai": "^4.1.2",
"@types/express": "^4.0.35",
"@types/lodash": "^4.14.96",
Expand Down
14 changes: 6 additions & 8 deletions magda-ckan-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@magda/ckan-connector",
"description": "MAGDA CKAN Connector",
"version": "0.0.37-0",
"version": "0.0.37-RC1",
"scripts": {
"build": "npm run compile",
"compile": "npm run compile-node && npm run compile-browser",
Expand All @@ -10,15 +10,13 @@
"watch": "tsc -p tsconfig-build.json --watch",
"start": "node dist/index.js",
"dev": "run-typescript-in-nodemon src/index.ts",
"docker-build-local":
"create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod":
"create-docker-context-for-node-component --build --push --tag auto"
"docker-build-local": "create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod": "create-docker-context-for-node-component --build --push --tag auto"
},
"author": "",
"license": "Apache-2.0",
"devDependencies": {
"@magda/scripts": "^0.0.37-0",
"@magda/scripts": "^0.0.37-RC1",
"@types/express": "^4.0.37",
"@types/node": "^8.0.14",
"@types/request": "^2.0.0",
Expand All @@ -33,8 +31,8 @@
"webpack": "^3.6.0"
},
"dependencies": {
"@magda/registry-aspects": "^0.0.37-0",
"@magda/typescript-common": "^0.0.37-0",
"@magda/registry-aspects": "^0.0.37-RC1",
"@magda/typescript-common": "^0.0.37-RC1",
"body-parser": "^1.18.1",
"express": "^4.15.4",
"moment": "^2.17.1",
Expand Down
14 changes: 6 additions & 8 deletions magda-csw-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@magda/csw-connector",
"description": "MAGDA OGC Catalogue Service for the Web (CSW) Connector",
"version": "0.0.37-0",
"version": "0.0.37-RC1",
"scripts": {
"build": "npm run compile",
"compile": "npm run compile-node && npm run compile-browser",
Expand All @@ -10,14 +10,12 @@
"watch": "tsc -p tsconfig-build.json --watch",
"start": "node dist/index.js",
"dev": "run-typescript-in-nodemon src/index.ts",
"docker-build-local":
"create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod":
"create-docker-context-for-node-component --build --push --tag auto"
"docker-build-local": "create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod": "create-docker-context-for-node-component --build --push --tag auto"
},
"license": "Apache-2.0",
"devDependencies": {
"@magda/scripts": "^0.0.37-0",
"@magda/scripts": "^0.0.37-RC1",
"@types/jsonpath": "^0.1.29",
"@types/lodash": "^4.14.66",
"@types/node": "^8.0.14",
Expand All @@ -31,8 +29,8 @@
"webpack": "^3.6.0"
},
"dependencies": {
"@magda/registry-aspects": "^0.0.37-0",
"@magda/typescript-common": "^0.0.37-0",
"@magda/registry-aspects": "^0.0.37-RC1",
"@magda/typescript-common": "^0.0.37-RC1",
"jsonpath": "^0.2.11",
"lodash": "^4.17.4",
"moment": "^2.17.1",
Expand Down
19 changes: 7 additions & 12 deletions magda-db-migrator/package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
{
"name": "@magda/db-migrator",
"version": "0.0.37-0",
"description":
"A base Docker image for PostgreSQL with Flyway for schema migrations.",
"version": "0.0.37-RC1",
"description": "A base Docker image for PostgreSQL with Flyway for schema migrations.",
"scripts": {
"docker-build-prod":
"create-docker-context-for-node-component --build --push --tag auto",
"make-latest":
"bash -c \"docker tag data61/magda-postgres:$npm_package_version data61/magda-postgres:latest && docker push data61/magda-postgres:latest\"",
"docker-build-local":
"create-docker-context-for-node-component --build --push --tag auto --local"
"docker-build-prod": "create-docker-context-for-node-component --build --push --tag auto",
"make-latest": "bash -c \"docker tag data61/magda-postgres:$npm_package_version data61/magda-postgres:latest && docker push data61/magda-postgres:latest\"",
"docker-build-local": "create-docker-context-for-node-component --build --push --tag auto --local"
},
"author": "",
"license": "Apache-2.0",
"config": {
"docker": {
"name": "data61/magda-db-migrator",
"include":
"Dockerfile flyway-commandline-4.2.0-linux-x64.tar.gz migrate.sh"
"include": "Dockerfile flyway-commandline-4.2.0-linux-x64.tar.gz migrate.sh"
}
},
"devDependencies": {
"@magda/scripts": "^0.0.37-0"
"@magda/scripts": "^0.0.37-RC1"
}
}
12 changes: 5 additions & 7 deletions magda-discussions-api/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
{
"name": "@magda/discussions-api",
"description": "MAGDA Discussions API",
"version": "0.0.37-0",
"version": "0.0.37-RC1",
"license": "Apache-2.0",
"scripts": {
"build": "npm run compile",
"compile": "tsc -p tsconfig-build.json",
"watch": "tsc -p tsconfig-build.json --watch",
"start": "node dist/index.js",
"dev": "run-typescript-in-nodemon src/index.ts",
"docker-build-local":
"create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod":
"create-docker-context-for-node-component --build --push --tag auto"
"docker-build-local": "create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod": "create-docker-context-for-node-component --build --push --tag auto"
},
"dependencies": {
"@magda/typescript-common": "^0.0.37-0",
"@magda/typescript-common": "^0.0.37-RC1",
"body-parser": "^1.13.2",
"express": "^4.13.1",
"isomorphic-fetch": "^2.2.1",
Expand All @@ -26,7 +24,7 @@
"yargs": "^8.0.2"
},
"devDependencies": {
"@magda/scripts": "^0.0.37-0",
"@magda/scripts": "^0.0.37-RC1",
"@types/express": "^4.0.35",
"@types/lodash": "^4.14.64",
"@types/node": "^8.0.14",
Expand Down
13 changes: 5 additions & 8 deletions magda-elastic-search/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"name": "@magda/elastic-search",
"version": "0.0.37-0",
"version": "0.0.37-RC1",
"description": "MAGDA's custom elasticsearch docker image.",
"scripts": {
"dev":
"create-pod-and-forward --configuration ../deploy/kubernetes/local/base/elasticsearch.yml --selector component=elasticsearch --port 9300",
"docker-build-local":
"create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod":
"create-docker-context-for-node-component --build --push --tag auto"
"dev": "create-pod-and-forward --configuration ../deploy/kubernetes/local/base/elasticsearch.yml --selector component=elasticsearch --port 9300",
"docker-build-local": "create-docker-context-for-node-component --build --push --tag auto --local",
"docker-build-prod": "create-docker-context-for-node-component --build --push --tag auto"
},
"author": "",
"license": "Apache-2.0",
Expand All @@ -19,6 +16,6 @@
}
},
"devDependencies": {
"@magda/scripts": "^0.0.37-0"
"@magda/scripts": "^0.0.37-RC1"
}
}
Loading

0 comments on commit cf800d0

Please sign in to comment.