Merge pull request #158 from didi/dev

change dockerfile and heml location
2025-12-25 04:32:12 +08:00 · 2021-02-03 10:09:43 +08:00
parent 9271a1caac 6bc5f81440
commit 419eb2ea41
15 changed files with 2 additions and 2 deletions
--- a/container/dockerfiles/Dockerfile
+++ b/container/dockerfiles/Dockerfile
@@ -22,8 +22,8 @@ RUN apk add --no-cache --virtual .build-deps \
 ENV AGENT_HOME /opt/agent/

 WORKDIR /tmp
-COPY ./docker-depends/config.yaml    $AGENT_HOME
-COPY ./docker-depends/jmx_prometheus_javaagent-0.14.0.jar $AGENT_HOME
+COPY docker-depends/config.yaml    $AGENT_HOME
+COPY docker-depends/jmx_prometheus_javaagent-0.14.0.jar $AGENT_HOME

 ENV JAVA_AGENT="-javaagent:$AGENT_HOME/jmx_prometheus_javaagent-0.14.0.jar=9999:$AGENT_HOME/config.yaml"

--- a/container/dockerfiles/docker-depends/config.yaml
+++ b/container/dockerfiles/docker-depends/config.yaml
--- a/container/helm/.helmignore
+++ b/container/helm/.helmignore
--- a/container/helm/Chart.yaml
+++ b/container/helm/Chart.yaml
--- a/container/helm/templates/NOTES.txt
+++ b/container/helm/templates/NOTES.txt
--- a/container/helm/templates/_helpers.tpl
+++ b/container/helm/templates/_helpers.tpl
--- a/container/helm/templates/configmap.yaml
+++ b/container/helm/templates/configmap.yaml
--- a/container/helm/templates/deployment.yaml
+++ b/container/helm/templates/deployment.yaml
--- a/container/helm/templates/hpa.yaml
+++ b/container/helm/templates/hpa.yaml
--- a/container/helm/templates/ingress.yaml
+++ b/container/helm/templates/ingress.yaml
--- a/container/helm/templates/service.yaml
+++ b/container/helm/templates/service.yaml
--- a/container/helm/templates/serviceaccount.yaml
+++ b/container/helm/templates/serviceaccount.yaml
--- a/container/helm/templates/tests/test-connection.yaml
+++ b/container/helm/templates/tests/test-connection.yaml
--- a/container/helm/values.yaml
+++ b/container/helm/values.yaml
--- a/docker-depends/jmx_prometheus_javaagent-0.14.0.jar
+++ b/docker-depends/jmx_prometheus_javaagent-0.14.0.jar