Skip to content

Commit

Permalink
slight updates
Browse files Browse the repository at this point in the history
jgoldverg committed Jun 17, 2024
1 parent cb258fc commit 178d2f2
Showing 2 changed files with 4 additions and 28 deletions.
30 changes: 2 additions & 28 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.9.6-amazoncorretto-21 AS build
FROM maven:3.9.7-amazoncorretto-21 AS build

COPY src /home/app/src
COPY pom.xml /home/app
@@ -15,39 +15,13 @@ RUN pip install pmeter-ods
COPY --from=build /home/app/target/ods-transfer-service-0.0.1-SNAPSHOT.jar /usr/local/lib/ods-transfer-service-0.0.1-SNAPSHOT.jar

ENV PIP_ROOT_USER_ACTION=ignore
ENV NODE_NAME="${NODE_NAME}"
ENV USER_NAME="${USER_NAME}"
ENV APP_NAME="${USER_NAME}"-"${NODE_NAME}"

ENV CONNECTOR_QUEUE="${APP_NAME}"
ENV ODS_GDRIVE_CLIENT_ID="${ODS_GDRIVE_CLIENT_ID}"
ENV ODS_GDRIVE_CLIENT_SECRET="${ODS_GDRIVE_CLIENT_SECRET}"
ENV ODS_GDRIVE_PROJECT_ID="onedatashare-dev"
ENV EUREKA_URI="${EUREKA_URI}"
ENV EUREKA_PASS="${EUREKA_PASS}"
ENV EUREKA_USER="${EUREKA_USER}"
ENV COCKROACH_URI="${COCKROACH_URI}"
ENV COCKROACH_USER="${COCKROACH_USER}"
ENV COCKROACH_PASS="${COCKROACH_PASS}"
ENV RMQ_ADDRESS="amqps://b-0e720b16-3ea7-4227-ad65-6cce3704121c.mq.us-east-2.amazonaws.com:5671"

#use ODS user for your private queue.
#create creds through aws console
ENV AMPQ_USER="${AMPQ_USER}"
ENV AMPQ_PWD="${AMPQ_PWD}"

#change to monitor the active NIC
ENV PMETER_CLI_OPTIONS="-NS"
ENV PMETER_NIC_INTERFACE="${PMETER_NIC_INTERFACE:-eth0}"
ENV INFLUX_ORG="${INFLUX_ORG}"
ENV INFLUX_BUCKET="${USER_NAME}"
ENV INFLUX_TOKEN="${INFLUX_TOKEN}"
ENV INFLUX_URI="https://influxdb.onedatashare.org"
ENV ENABLE_PMETER="true"
ENV PMETER_CRON_EXP="*/15 * * * * *"

ENV OPTIMIZER_URL="${OPTIMIZER_URL}"
ENV OPTIMIZER_ENABLE="${OPTIMIZER_ENABLE}"
ENV SPRING_PROFILES_ACTIVE=aws,virtual,cockroach

ENV PATH "/home/ods/.local/bin:${PATH}"

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.onedatashare.transferservice.odstransferservice.config;

import com.amazonaws.regions.AwsRegionProvider;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -51,5 +52,6 @@ public BackOffPolicy backOffPolicy() {
backOffPolicy.setMaxInterval(TimeUnit.DAYS.toMillis(1));
return backOffPolicy;
}

}

0 comments on commit 178d2f2

Please sign in to comment.