From dbf66434638f052bf79409d0b17750e01f96cc9f Mon Sep 17 00:00:00 2001
From: Tony Hansen <tony@att.com>
Date: Fri, 21 Aug 2020 15:27:43 +0000
Subject: Revert "Run in Python 3.8"

This reverts commit 49d734038679e128ecd523aea45391327685ce41.

Reason for revert: version bump missing

Change-Id: Ifc8e76857d52832246d7f414481293d1e17b0c3f
Signed-off-by: Tony Hansen <th1395@att.com>
Issue-ID: DCAEGEN2-2292
---
 Dockerfile | 60 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 34dbb2c..56940a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
 # ================================================================================
 # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
-# Copyright 2020 Deutsche Telekom. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,41 +16,42 @@
 #
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
-# Use the recommended by SECCOM Python as the base image
-FROM nexus3.onap.org:10001/onap/integration-python:7.0.1
+# Use the official Python as the base image
+FROM python:3.6
 
-ARG user=onap
-ARG group=onap
+ENV INSROOT /opt/app
+ENV APPUSER policy_handler
+ENV APPDIR ${INSROOT}/${APPUSER}
 
-USER root
+RUN useradd -d ${APPDIR} ${APPUSER}
+
+WORKDIR ${APPDIR}
 
 # Make port 25577 available to the world outside this container
 EXPOSE 25577
 
-# Copy the current directory content into the container at WORKDIR
-COPY --chown=onap:onap ./*.py ./
-COPY --chown=onap:onap ./*.in ./
-COPY --chown=onap:onap ./*.txt ./
-COPY --chown=onap:onap ./run_policy.sh ./
-COPY --chown=onap:onap ./policyhandler/ ./policyhandler/
-COPY --chown=onap:onap ./etc/ ./etc/
-COPY --chown=onap:onap ./etc_customize/ ./etc_customize/
-
-RUN apk add build-base linux-headers openssl iproute2 bash && \
-    pip install -r requirements.txt
-
-RUN mkdir -p logs \
- && chown -R $user:$group . \
- && chmod a+w logs \
- && chmod 500 etc \
- && chmod 500 run_policy.sh \
- && (CUST_SH=./etc_customize/customize.sh && test -e $CUST_SH && chmod 500 $CUST_SH \
-   && ($CUST_SH | tee -a logs/"customize_$user_$(date +%Y_%m%d-%H%M%S).log" 2>&1)) \
- && ls -laR .
-
-USER $user
-
-VOLUME logs
+# Copy the current directory content into the container at ${APPDIR}
+COPY ./*.py ./
+COPY ./*.in ./
+COPY ./*.txt ./
+COPY ./run_policy.sh ./
+COPY ./policyhandler/ ./policyhandler/
+COPY ./etc/ ./etc/
+COPY ./etc_customize/ ./etc_customize/
+
+RUN mkdir -p ${APPDIR}/logs \
+ && chown -R ${APPUSER}:${APPUSER} ${APPDIR} \
+ && chmod a+w ${APPDIR}/logs \
+ && chmod 500 ${APPDIR}/etc \
+ && chmod 500 ${APPDIR}/run_policy.sh \
+ && pip install -r requirements.txt \
+ && (CUST_SH=./etc_customize/customize.sh && test -e ${CUST_SH} && chmod 500 ${CUST_SH} \
+   && (${CUST_SH} | tee -a logs/"customize_${APPUSER}_$(date +%Y_%m%d-%H%M%S).log" 2>&1)) \
+ && ls -laR ${APPDIR}/
+
+USER ${APPUSER}
+
+VOLUME ${APPDIR}/logs
 
 # Run run_policy.sh when the container launches
 CMD ["./run_policy.sh"]
-- 
cgit 1.2.3-korg