Code Review
/
ric-plt
/
a1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding configuration for rmr"
[ric-plt/a1.git]
/
Dockerfile
diff --git
a/Dockerfile
b/Dockerfile
index
a9e6c15
..
6479928
100644
(file)
--- a/
Dockerfile
+++ b/
Dockerfile
@@
-64,9
+64,8
@@
RUN GO111MODULE=on go mod download
# build and test
COPY . /go/src/ws
COPY ./config/config_test.yaml /opt/a1-mediator/
# build and test
COPY . /go/src/ws
COPY ./config/config_test.yaml /opt/a1-mediator/
-COPY ./config/config_rmr.json /opt/a1-mediator/
-ENV CFG_FILE=/opt/a1-mediator/config
-_rmr.json
+ENV CFG_FILE=/opt/a1-mediator/config
_test.yaml
ENV A1_CONFIG_FILE=/opt/a1-mediator/config_test.yaml
ENV A1_CONFIG_FILE=/opt/a1-mediator/config_test.yaml
@@
-110,16
+109,16
@@
RUN mkdir -p /opt/a1-mediator \
COPY --from=a1-build /go/src/ws/cache/go/cmd/a1 /opt/a1-mediator/a1
COPY ./config/config.yaml /opt/a1-mediator/
COPY --from=a1-build /go/src/ws/cache/go/cmd/a1 /opt/a1-mediator/a1
COPY ./config/config.yaml /opt/a1-mediator/
-COPY ./config/config_rmr.json /opt/a1-mediator/
WORKDIR /opt/a1-mediator
WORKDIR /opt/a1-mediator
-ARG
RMR_CONFIG=/opt/a1-mediator/config-_rmr.json
-ENV CFG_FILE=$
RMR_
CONFIG
+ARG
CONFIG=/opt/a1-mediator/config.yaml
+ENV CFG_FILE=$CONFIG
ARG A1_CONFIG=/opt/a1-mediator/config.yaml
ENV A1_CONFIG_FILE=$A1_CONFIG
COPY a1-entrypoint.sh /opt/a1-mediator/
ARG A1_CONFIG=/opt/a1-mediator/config.yaml
ENV A1_CONFIG_FILE=$A1_CONFIG
COPY a1-entrypoint.sh /opt/a1-mediator/
+RUN chmod -R 755 /opt/a1-mediator/a1-entrypoint.sh
ENTRYPOINT ["/opt/a1-mediator/a1-entrypoint.sh"]
ENTRYPOINT ["/opt/a1-mediator/a1-entrypoint.sh"]