This is an automated email from the ASF dual-hosted git repository.
magicaltrout pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drat.git
The following commit(s) were added to refs/heads/master by this push:
new d2562ca add docker file
d2562ca is described below
commit d2562cac3fe9041f218aa0d574672f1af8892347
Author: Tom Barber <[email protected]>
AuthorDate: Fri Mar 29 23:47:45 2019 +0000
add docker file
---
.gitlab-ci.yml | 14 +++++++++++-
Dockerfile | 26 ++++++++++++++++++++++
.../src/main/webapp/resources/package-lock.json | 24 ++++++++++++++------
3 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c52cce2..7d494ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,10 +12,22 @@ cache:
before_script:
- apt-get update && curl -sL https://deb.nodesource.com/setup_10.x | bash -
&& apt install nodejs npm
-build:
+build_artifact:
stage: build
script:
- mvn clean install -DskipTests
artifacts:
paths:
- "distribution/target/dms-distribution-0.1-bin.tar.gz"
+
+publish_docker:
+ stage: publish
+ image: docker:1.11
+ dependencies:
+ - build_artifact
+ services:
+ - docker:dind
+ script:
+ - docker build -t $CI_REPO:${CI_COMMIT_REF_NAME/\//_} .
+ - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
+ - docker push $CI_REPO:${CI_COMMIT_REF_NAME/\//_}
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..9c77c64
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,26 @@
+From ubuntu:bionic
+
+COPY distribution/target/dms-distribution-0.1-bin.tar.gz /
+
+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
+ENV DRAT_HOME=/root/drat/deploy
+ENV GANGLIA_URL=http://zipper.jpl.nasa.gov/ganglia/
+ENV FILEMGR_URL=http://localhost:9000
+ENV WORKFLOW_URL=http://localhost:9001
+ENV RESMGR_URL=http://localhost:9002
+ENV WORKFLOW_HOME=$DRAT_HOME/workflow
+ENV FILEMGR_HOME=$DRAT_HOME/filemgr
+ENV PGE_ROOT=$DRAT_HOME/pge
+ENV PCS_HOME=$DRAT_HOME/pcs
+ENV FMPROD_HOME=$DRAT_HOME/tomcat/webapps/fmprod/WEB-INF/classes/
+ENV PATH=$JAVA_HOME/bin:$PATH
+ENV SOLR_DRAT_URL=http://localhost:8080/solr/drat
+ENV DRAT_EXCLUDE=""
+
+RUN apt update && apt install -y python3 python3-pip openjdk-8-jdk && pip3
install requests && mkdir -p /root/drat/deploy && tar xvfz
dms-distribution-0.1-bin.tar.gz -C /root/drat/deploy/ \
+&& echo 'alias fmquery="java
-Dorg.apache.oodt.cas.filemgr.properties=$FILEMGR_HOME/etc/filemgr.properties
-Djava.ext.dirs=.$FILEMGR_HOME/lib org.apache.oodt.cas.filemgr.tools.QueryTool
--url $FILEMGR_URL --lucene -query "' >> /root/.bashrc \
+&& echo 'alias fmdel="java
-Dorg.apache.oodt.cas.filemgr.properties=$FILEMGR_HOME/etc/filemgr.properties
-Djava.ext.dirs=$FILEMGR_URL/lib
org.apache.oodt.cas.filemgr.tools.DeleteProduct --fileManagerUrl $FILEMGR_URL
--read"' >> /root/.bashrc \
+&& echo 'alias metdump="java -Djava.ext.dirs=$FILEMGR_HOME/lib
org.apache.oodt.cas.filemgr.tools.MetadataDumper --url $FILEMGR_URL --out .
--productId "' >> /root/.bashrc
+
+
+CMD /root/drat/deploy/bin/oodt start && tail -f /root/drat/deploy/logs/oodt.out
diff --git a/webapps/proteus-new/src/main/webapp/resources/package-lock.json
b/webapps/proteus-new/src/main/webapp/resources/package-lock.json
index 38cf4b1..c21235b 100644
--- a/webapps/proteus-new/src/main/webapp/resources/package-lock.json
+++ b/webapps/proteus-new/src/main/webapp/resources/package-lock.json
@@ -2591,7 +2591,8 @@
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz";,
"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
- "dev": true
+ "dev": true,
+ "optional": true
},
"coa": {
"version": "2.0.2",
@@ -4949,7 +4950,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
@@ -5364,7 +5366,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -5420,6 +5423,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -5463,12 +5467,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
@@ -6692,6 +6698,7 @@
"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";,
"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
"dev": true,
+ "optional": true,
"requires": {
"prelude-ls": "~1.1.2",
"type-check": "~0.3.2"
@@ -8421,7 +8428,8 @@
"version": "1.1.2",
"resolved":
"https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";,
"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
- "dev": true
+ "dev": true,
+ "optional": true
},
"prettier": {
"version": "1.16.3",
@@ -8996,7 +9004,8 @@
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz";,
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
- "dev": true
+ "dev": true,
+ "optional": true
},
"rx-lite-aggregates": {
"version": "4.0.8",
@@ -10226,6 +10235,7 @@
"resolved":
"https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";,
"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
"dev": true,
+ "optional": true,
"requires": {
"prelude-ls": "~1.1.2"
}
