Merge pull request #551 from NREL/nono

Purge per NREL management and legal

.bash_profile

@@ -29,25 +29,6 @@ export DYLD_LIBRARY_PATH  # for Mac
 #==============================================================================
 
 
-#------------------------------------------------------------------------------
-
-#  Uncomment the following if you are using the Xpress solver
-#------------------------------------------------------------------------------
-#XPRESSDIR="/usr/local/opt/xpress"
-#DYLD_LIBRARY_PATH="${XPRESSDIR}/lib:${SRC_DIR}:${DYLD_LIBRARY_PATH}"  # for Mac
-#LD_LIBRARY_PATH="${XPRESSDIR}/lib:${SRC_DIR}:${LD_LIBRARY_PATH}"  # for Linux
-#CLASSPATH="${XPRESSDIR}/lib/xprs.jar:${XPRESSDIR}/lib/xprb.jar:${XPRESSDIR}/lib/xprm.jar:${CLASSPATH}"
-#PATH="${XPRESSDIR}/bin:${PATH}"
-#
-#export PATH
-#export XPRESS="$XPRESSDIR/bin"
-#export DYLD_LIBRARY_PATH
-#export LD_LIBRARY_PATH
-#export CLASSPATH
-#source /opt/xpressmp/bin/xpvars.sh
-#==============================================================================
-
-
 #------------------------------------------------------------------------------
 #  You can change the following to add Julia to your system Path
 #------------------------------------------------------------------------------

.gitattributes

@@ -1,2 +1 @@
 #pattern  filter=crypt diff=crypt
-julia_src/xpress/licenseserver/xpauth.xpr filter=crypt diff=crypt merge=crypt

.gitignore

@@ -114,8 +114,4 @@ all_data*
 docs/formulation/*aux
 docs/formulation/*log
 
-# Customized docker files
-docker-compose.xpressOS.yml
-Dockerfile.xpressOS.pyjul
-
 /.werf_secret_key

docker-compose.nginx.yml

@@ -74,14 +74,6 @@ services:
       - django-nginx
     restart: "on-failure"
 
-  licenseserver:
-    build:
-      context: julia_src/xpress/licenseserver
-    mac_address: c4:b3:01:d3:d5:eb
-    command: xpserver
-    expose:
-      - 27100
-
   julia-nginx:
     container_name: julia-nginx
     build:
@@ -91,8 +83,6 @@ services:
       - JULIA_NUM_THREADS=2
     expose:
       - 8081
-    depends_on:
-      - licenseserver
     volumes:
       - ./julia_src:/opt/julia_src
 

docker-compose.nojulia.yml

@@ -65,14 +65,5 @@ services:
     volumes:
       - .:/opt/reopt
 
-  licenseserver:
-    container_name: licenseserver-nojul
-    build:
-      context: julia_src/xpress/licenseserver
-    mac_address: c4:b3:01:d3:d5:eb
-    command: xpserver
-    expose:
-      - 27100
-
 volumes:
   pgdata:

docker-compose.yml

@@ -58,26 +58,13 @@ services:
       - 8000:8000
     volumes:
       - .:/opt/reopt
-
-  licenseserver:
-    container_name: xpress_license_server
-    build:
-      context: julia_src/xpress/licenseserver
-    mac_address: c4:b3:01:d3:d5:eb
-    command: xpserver
-    expose:
-      - 27100
 
   julia:
     container_name: julia_api
     build:
       context: julia_src/
-      args:
-        - XPRESS_LICENSE_HOST=xpress_license_server
     command: julia --project=/opt/julia_src http.jl
     ports:
       - "8081:8081"
-    depends_on: 
-      - licenseserver
     volumes:
       - ./julia_src:/opt/julia_src

julia_src/Dockerfile

@@ -1,29 +1,10 @@
-FROM reopt/xpressbase AS xpress
-
 FROM julia:1.8.5
 
 # Install NREL root certs for machines running on NREL's network.
 ARG NREL_ROOT_CERT_URL_ROOT=""
 RUN set -x && if [ -n "$NREL_ROOT_CERT_URL_ROOT" ]; then curl -fsSLk -o /usr/local/share/ca-certificates/nrel_root.crt "${NREL_ROOT_CERT_URL_ROOT}/nrel_root.pem" && curl -fsSLk -o /usr/local/share/ca-certificates/nrel_xca1.crt "${NREL_ROOT_CERT_URL_ROOT}/nrel_xca1.pem" &&  update-ca-certificates; fi
 ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 
-# Install Xpress solver for client
-ENV XPRESSDIR=/opt/xpressmp
-ENV XPRESS=/opt/xpressmp/bin
-ENV LD_LIBRARY_PATH=${XPRESSDIR}/lib:${LD_LIBRARY_PATH}
-ENV LIBPATH=${XPRESSDIR}/lib:${LIBPATH}
-ARG CLASSPATH=${XPRESSDIR}/lib/xprs.jar:${CLASSPATH}
-ARG CLASSPATH=${XPRESSDIR}/lib/xprb.jar:${CLASSPATH}
-ENV CLASSPATH=${XPRESSDIR}/lib/xprm.jar:${CLASSPATH}
-ENV PATH=${XPRESSDIR}/bin:${PATH}
-
-WORKDIR /opt/reopt/solver
-COPY --from=xpress  /opt/reopt/solver .
-RUN sed -i -e 's/\r$//' install.sh
-ARG XPRESS_LICENSE_HOST=licenseserver
-RUN set -x && printf "f\nc\n\nn\n\n${XPRESS_LICENSE_HOST}\ny\n" | ./install.sh >> license_info.txt;
-RUN rm xp8.12.3_linux_x86_64.tar.gz
-
 # Install gfortran for /ghpghx
 RUN apt-get update && apt-get install -y \
     gfortran

julia_src/docker-compose.yml

@@ -1,21 +1,11 @@
 version: "2.1"
 
 services: 
-  licenseserver:
-    container_name: xpress_license_server_dev
-    build:
-      context: ./xpress/licenseserver
-    mac_address: c4:b3:01:d3:d5:eb
-    command: xpserver
-    expose:
-      - 27100
 
   julia:
     container_name: julia_api_dev
     build:
       context: .
-      args:
-        - XPRESS_LICENSE_HOST=xpress_license_server_dev
     command: julia --project="/opt/julia_src" http.jl
     ports:
       - "8081:8081"

julia_src/xpress/Dockerfile

@@ -1,7 +1,2 @@
 FROM ubuntu:latest
-# For creating base image of Julia API. Requires an untracked tar.gz file for FICO Xpress
-# Used in both production and local development
-
-WORKDIR /opt/reopt/solver
-COPY xp8.12.3_linux_x86_64.tar.gz .
-COPY install.sh .
+# For creating base image of Julia API