Feature/flamingo deployment

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "oasis_keys_server"]
-	path = oasis_keys_server
-	url = git+ssh://git@github.com/OasisLMF/oasis_keys_server

Dockerfile.gemfoundation_gmo_keys_server

@@ -1,46 +1,19 @@
-FROM coreoasis/oasis_base:latest
-
-RUN mkdir /var/www/oasis && \
-    mkdir /var/oasis && \
-    mkdir /var/log/oasis && \
-    chown www-data:www-data /var/log/oasis && \
-    chmod 744 /var/log/oasis && \
-    touch /var/log/oasis/keys_server.log && \
-    chown www-data:www-data /var/log/oasis/keys_server.log && \
-    chmod 644 /var/log/oasis/keys_server.log
-
-COPY ./keys_server_config/apache2.conf /etc/apache2/
-COPY ./keys_server_config/oasis.conf /etc/apache2/sites-available/
-COPY ./keys_server_config/oasis.wsgi /var/www/oasis/
-
-RUN mkdir /var/www/oasis/oasis_keys_server
-COPY ./src/oasis_keys_server/ /var/www/oasis/oasis_keys_server/
-RUN rm -fr /var/www/oasis/oasis_keys_server/docs && \
-    rm -fr /var/www/oasis/oasis_keys_server/venv
+FROM coreoasis/model_keys_server:latest
 
 RUN mkdir /var/www/oasis/keys_server
 COPY ./src/keys_server/__init__.py.base /var/www/oasis/keys_server/__init__.py
 RUN echo "\nfrom .GMO import *" >> /var/www/oasis/keys_server/__init__.py
-COPY ./src/keys_server/utils.py /var/www/oasis/keys_server/
 COPY ./src/keys_server/requirements.txt /var/www/oasis/keys_server/
 RUN mkdir /var/www/oasis/keys_server/GMO
 COPY ./src/keys_server/GMO/ /var/www/oasis/keys_server/GMO/
-COPY ./src/keys_server/GMO/KeysServer.ini /var/www/oasis/oasis_keys_server/
+COPY ./src/keys_server/GMO/KeysServer.ini /var/www/oasis_keys_server/
 
 RUN mkdir /var/oasis/keys_data && \
     chown www-data:www-data /var/oasis/keys_data && \
     chmod -R 744 /var/oasis/keys_data
 COPY ./keys_data/GMO/ /var/oasis/keys_data/
 
-COPY ./src/oasis_keys_server/startup.sh  /usr/local/bin/
-RUN chmod +x /usr/local/bin/startup.sh
-
-RUN pip install -r /var/www/oasis/oasis_keys_server/requirements.txt && \
-    pip install -r /var/www/oasis/keys_server/requirements.txt && \
+RUN pip install -r /var/www/oasis/keys_server/requirements.txt && \
     pip install -r /var/www/oasis/keys_server/GMO/requirements.txt
 
-RUN a2dissite 000-default && \
-    a2ensite oasis.conf
-EXPOSE 5000
-
-ENTRYPOINT startup.sh; tail -f /var/log/oasis/keys_server.log
+ENTRYPOINT startup.sh

Dockerfile.gemfoundation_gmo_model_execution_worker

@@ -1,8 +1,8 @@
 FROM coreoasis/model_execution_worker:OASIS_0_0_0_167
 
-COPY ./src/model_execution_worker/GEMFoundation ./model_execution_worker/GEMFoundation
+COPY ./src/model_execution_worker/gemoasismodel ./model_execution_worker/gemoasismodel
 COPY ./model_data/ /var/oasis/model_data/
-COPY ./model_data/GMO /var/oasis/model_data/GEMFoundation/GMO
+COPY ./model_data/GMO /var/oasis/model_data/gemoasismodel/GMO
 RUN touch /var/log/oasis/celery_worker.log
 RUN chmod 666 /var/log/oasis/celery_worker.log