Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use io.fabric8:docker-maven-plugin to build and push docker images
[policy/engine.git]
/
packages
/
docker
/
src
/
main
/
docker
/
Dockerfile
diff --git
a/packages/docker/src/main/docker/Dockerfile
b/packages/docker/src/main/docker/Dockerfile
index
6070443
..
7ef47b4
100644
(file)
--- a/
packages/docker/src/main/docker/Dockerfile
+++ b/
packages/docker/src/main/docker/Dockerfile
@@
-1,33
+1,23
@@
-FROM
alpine:3.9
+FROM
onap/policy-common-alpine:1.4.0
-ARG HTTP_PROXY=${HTTP_PROXY}
-ARG HTTPS_PROXY=${HTTPS_PROXY}
-ARG BUILD_VERSION
=${BUILD_VERSION
}
+LABEL maintainer="Policy Team"
+
+ARG BUILD_VERSION
_ENGINE=${BUILD_VERSION_ENGINE
}
ARG POLICY_LOGS=/var/log/onap
ARG POLICY_LOGS=/var/log/onap
-ENV http_proxy $HTTP_PROXY
-ENV https_proxy $HTTPS_PROXY
-ENV BUILD_VERSION ${BUILD_VERSION}
+ENV BUILD_VERSION_ENGINE ${BUILD_VERSION_ENGINE}
ENV POLICY_LOGS ${POLICY_LOGS}
ENV POLICY_LOGS ${POLICY_LOGS}
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-
-RUN apk --update add --no-cache busybox-extras \
- bash coreutils grep findutils \
- zip unzip curl \
- wget openssh maven jq \
- httpie py-pip openjdk8
-
-RUN adduser -S policy -s /bin/bash
-# install MariaDB client
-RUN apk --update add --no-cache mariadb-client
+RUN apk add --no-cache mariadb-client
-RUN mkdir -p /opt/app/policy /tmp/policy-install ${POLICY_LOGS} && \
- chown policy /opt/app/policy /tmp/policy-install ${POLICY_LOGS}
+RUN mkdir -p /tmp/policy-install ${POLICY_LOGS} && \
+ chown policy:policy /tmp/policy-install ${POLICY_LOGS} && \
+ rmdir ${POLICY_HOME}/etc/ssl && \
+ rmdir ${POLICY_HOME}/etc
WORKDIR /tmp/policy-install
WORKDIR /tmp/policy-install
-COPY install.zip docker-install.sh do-start.sh wait-for-port.sh ./
+COPY
/maven/
install.zip docker-install.sh do-start.sh wait-for-port.sh ./
RUN unzip install.zip && rm install.zip && chown policy * && chmod +x *.sh
USER policy
RUN unzip install.zip && rm install.zip && chown policy * && chmod +x *.sh
USER policy