Code Review
/
aai
/
babel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Updated pom to remove distribution-management section and corrected aai base image...
[aai/babel.git]
/
src
/
main
/
docker
/
Dockerfile
diff --git
a/src/main/docker/Dockerfile
b/src/main/docker/Dockerfile
index
369d1b5
..
623cfd8
100644
(file)
--- a/
src/main/docker/Dockerfile
+++ b/
src/main/docker/Dockerfile
@@
-1,21
+1,23
@@
-FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
+FROM @
docker.push.registry@/@
aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
ARG MICRO_HOME=/opt/app/babel
# Build up the deployment folder structure
ARG MICRO_HOME=/opt/app/babel
# Build up the deployment folder structure
-RUN mkdir -p $MICRO_HOME $MICRO_HOME/logs
-
-RUN groupadd aaiadmin -g 1000
-RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin
+#RUN groupadd aaiadmin -g 1000
+#RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin
WORKDIR $MICRO_HOME
WORKDIR $MICRO_HOME
-RUN chown -R aaiadmin:aaiadmin $MICRO_HOME $MICRO_HOME/logs
+USER root
-COPY --chown=aaiadmin:aaiadmin /maven/babel/ .
+# Create the aai user
+RUN mkdir -p /opt/aaihome $MICRO_HOME /logs && \
+ ln -s /logs $MICRO_HOME/logs && \
+ chown -R aaiadmin:aaiadmin $MICRO_HOME && \
+ chown -R aaiadmin:aaiadmin /logs
-USER aaiadmin
+COPY --chown=aaiadmin:aaiadmin /maven/babel/ .
+# The start script is executable and can be run directly.
-RUN chmod 755 bin/* \
- && ln -s /logs $MICRO_HOME/logs
+ENTRYPOINT ["/sbin/tini", "--", "/bin/bash", "/opt/app/babel/bin/start.sh"]
-CMD ["/opt/app/babel/bin/start.sh"]
+USER aaiadmin