Commit 5b55a2c7 authored by Frank Greguska's avatar Frank Greguska
Browse files

fixing everything. got messed up somehow

parent 1a1d65fb
Loading
Loading
Loading
Loading
+65 −17
Original line number Diff line number Diff line
@@ -3,33 +3,81 @@ from centos:6

MAINTAINER Frank Greguska <greguska@jpl.nasa.gov>


RUN yum clean all && \
    yum -y update && \
    yum -y install wget \
    git \
    sudo \
    epel-release
    epel-release \
    gcc \
    https://centos6.iuscommunity.org/ius-release.rpm
    
RUN yum -y install libffi-devel \
    openssl-devel \
    python27 \
    python27-devel \
    python27-pip \
    python27-setuptools
    
    
RUN groupadd -r slcs && adduser -r -g slcs slcs
    
ENV APPLICATION_HOME=/usr/local/esgf-slcs-server
ENV CODE_LOCATION=$APPLICATION_HOME/src/esgf_slcs_server \
    APPLICATION_CONF_DIR=$APPLICATION_HOME/conf/app
    
RUN mkdir -p $CODE_LOCATION && \
    mkdir -p $APPLICATION_CONF_DIR && \
    chown -R slcs:slcs $APPLICATION_HOME && \
    chown -R :slcs /usr/lib/python2.7 && \
    chmod -R g+wx /usr/lib/python2.7 && \
    chown -R :slcs /usr/lib64/python2.7 && \
    chmod -R g+wx /usr/lib64/python2.7 && \
    chown -R :slcs /usr/bin && \
    chmod -R g+wx /usr/bin && \
    chown -R :slcs $APPLICATION_CONF_DIR && \
    chmod -R g+wx $APPLICATION_CONF_DIR

USER slcs
WORKDIR $CODE_LOCATION
ARG ESGF_SLCS_SERVER_VERSION=master
ENV START_HERE=yes
RUN git init && \
    git pull https://github.com/fgreg/esgf-slcs-server $ESGF_SLCS_SERVER_VERSION && \
    pip2.7 install -r requirements.txt && \
    pip2.7 install waitress

USER root
COPY settings.py $CODE_LOCATION/esgf_slcs_server/settings.py
RUN chown slcs:slcs $CODE_LOCATION/esgf_slcs_server/settings.py && \
    chmod 644 $CODE_LOCATION/esgf_slcs_server/settings.py
USER slcs
RUN pip2.7 install $CODE_LOCATION
    
RUN yum -y install ansible
RUN touch $APPLICATION_CONF_DIR/secret_key.txt && \
    tr -dc '[:alnum:][:punct:]' < /dev/urandom | head -c 100 > $APPLICATION_CONF_DIR/secret_key.txt && \
    chmod 400 $APPLICATION_CONF_DIR/secret_key.txt
    
WORKDIR /usr/local/esgf-slcs-server
VOLUME $APPLICATION_HOME/conf/db
VOLUME $APPLICATION_HOME/conf/ca

COPY production_all.yml /usr/local/esgf-slcs-server
COPY development.yml /usr/local/esgf-slcs-server
ENV SERVER_FQDN=www.my-slcs-server.com \
    APPLICATION_USER=waitress
ENV SLCS_APPLICATION_HOME=$APPLICATION_HOME \
    SLCS_STATIC_ROOT=/var/www/static

VOLUME ["/usr/local/esgf-slcs-server/ca"]

# RUN git clone https://github.com/cedadev/esgf-slcs-server-playbook.git && \
#     ansible-playbook -i esgf-slcs-server-playbook/playbook/inventories/localhost -e "@/usr/local/esgf-slcs-server/production_all.yml" -e "application_user=${APPLICATION_USER}" -e "server_name=${SERVER_FQDN}" esgf-slcs-server-playbook/playbook/playbook.yml
COPY onlineca.ini $APPLICATION_CONF_DIR/onlineca.ini
COPY docker-entrypoint.py /usr/local/bin/docker-entrypoint.py

WORKDIR /code
RUN git clone https://github.com/cedadev/esgf-slcs-server.git && chmod -R 777 /code
WORKDIR /usr/local/esgf-slcs-server
# RUN git clone https://github.com/cedadev/esgf-slcs-server-playbook.git && \
#     ansible-playbook -i esgf-slcs-server-playbook/playbook/inventories/localhost -e "@/usr/local/esgf-slcs-server/development.yml" esgf-slcs-server-playbook/playbook/playbook.yml
USER root
RUN chown slcs:slcs $APPLICATION_CONF_DIR/onlineca.ini && \
    chmod 644 $APPLICATION_CONF_DIR/onlineca.ini && \
    mkdir -p $SLCS_STATIC_ROOT && \
    chown -R slcs:slcs $SLCS_STATIC_ROOT && \
    chmod -R 744 $SLCS_STATIC_ROOT && \
    chown slcs:slcs /usr/local/bin/docker-entrypoint.py && \
    chmod 744 /usr/local/bin/docker-entrypoint.py
USER slcs


CMD ["/bin/bash"]
 No newline at end of file
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.py"]
CMD ["--help"]
 No newline at end of file

slcs-server/ca/onlineca.crt

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line
-----BEGIN CERTIFICATE-----
MIIDLjCCAhagAwIBAwIBATANBgkqhkiG9w0BAQUFADA3MREwDwYDVQQLEwhTZWN1
cml0eTEUMBIGA1UEAxMLTkRHIFRlc3QgQ0ExDDAKBgNVBAoTA05ERzAeFw0xMjA5
MTkwOTIzNDdaFw0xMjA5MjAwOTIzNDhaMDcxETAPBgNVBAsTCFNlY3VyaXR5MRQw
EgYDVQQDEwtOREcgVGVzdCBDQTEMMAoGA1UEChMDTkRHMIIBIjANBgkqhkiG9w0B
AQEFAAOCAQ8AMIIBCgKCAQEAut7Tf4i4QGvrJQnFc4MczctvOlSDteWEsEU6o8KV
aHquUBatZUmH4H7sK8aUbd6zP5oUDD4k22opscdq3XyQw6hqQlT2xCjRO0G33nyM
5OSqHXh3A0rVLdklkpQ8a6TJorAKspTXqu8kWrAmZqJigW9c9LyTJXZRrIq2kuKK
Z2m9QlNCEdFAMUTcsCKIb79O5+oXMdWLMyUMKOWLEtHKAQp7b7iNliHFGT4pnJnv
o5AGE/fbiS6m6n72R8Ne7pMel1PdwTXnzVqEGzMGAEnDnPrv2QO96OtCP3QOGYc9
5BchmHV3A4c1WHrX2qfQBtryspfwdVXj9Qlnf3SbP7LTIQIDAQABo0UwQzASBgNV
HRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUZVYBhuA4
0yShc5485O0yAwgsoIUwDQYJKoZIhvcNAQEFBQADggEBACBCJ+yUf7SuPtnfXatD
FrhvqhQt1dughCh9sEZFzSCaPQh3/DMQmc8kqh4fwf3OTOmifS01Y/g6vO/CExQp
E3d/de4fSHYP4oYQCTcyQBI2+JjOOL/72JY8/gMA6JMtQj+YThJfNPrOSzFcm16x
epil4rJsrMfP70hBZI+yeIF6rs7jzMpMaghKWwjcblX5VXXLJi7HJywsPq7KARoj
FsHgKyqgqk2dlmQhBOQwlObZp4FimHMN76Ql3plN4Y/MxaIx89l6ZOppq9jJvz63
oB7YSWcCMYM5ElEo693PO6p75XKrs0NuVne477+cQqROnYFQKI2zrU6speRWNkM+
Hwo=
-----END CERTIFICATE-----

slcs-server/ca/onlineca.key

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line
-----BEGIN RSA PRIVATE KEY-----
MIIEpQIBAAKCAQEAut7Tf4i4QGvrJQnFc4MczctvOlSDteWEsEU6o8KVaHquUBat
ZUmH4H7sK8aUbd6zP5oUDD4k22opscdq3XyQw6hqQlT2xCjRO0G33nyM5OSqHXh3
A0rVLdklkpQ8a6TJorAKspTXqu8kWrAmZqJigW9c9LyTJXZRrIq2kuKKZ2m9QlNC
EdFAMUTcsCKIb79O5+oXMdWLMyUMKOWLEtHKAQp7b7iNliHFGT4pnJnvo5AGE/fb
iS6m6n72R8Ne7pMel1PdwTXnzVqEGzMGAEnDnPrv2QO96OtCP3QOGYc95BchmHV3
A4c1WHrX2qfQBtryspfwdVXj9Qlnf3SbP7LTIQIDAQABAoIBAQCgwTN8UOcANFZS
xHchibbrqogCy9WKUum0oblySuAwwujVaMy9h2XmUAlnFyt04NGeczOv3H3kaw13
LC/YXWJDjsvqSCEIWnyz1zMPqGGkPrnBJHJtWKDPEjBqSi84AsiatYpeWgC1wYeq
pEJEpIjNBDoZJ2gGICTeo22wKkYZ8rpWbAAn8n8BMiD8PvdonxwyH2O+tvztzG6v
AHV+M2FcVtm7XRtM2ZGOu2/VMxMwtjn6WRM3CipUr1/ieUFa/aJROo2ODz7C/Tiz
BWmcQlVr1XT6Do+ooSvwAdpt5f2C18LKru+AmHmbrrCoPG0TjTZSbAls98tJ40m/
7cxLhtbhAoGBANtgAbHL8PDuuN8hjnv9ABMCBM6h+ERYnyc9aARAQU6K3ZDQkBxx
g2Ld8kimKQ3gwPzjaC5+2qQ+cNM0W28Gkkctj+3W1PitFgnVGojAQxyTr17GzWxc
baKvwcGD6uTTu2K6n9GRyAfOV2yQgXTzvb3lnfspGiClO4y8hVvbl5k1AoGBANoR
lim7u9Md0N05kz3vfSl09ZOMQ8XYtak4ZZgxSkZV9lOxwNGB9HmbLx1qatmWqnrA
f8avptGlX15zo1l1x7HB0PKONM/pY0GmMjk4vio6S5cafyUUgF0D8Py2l9GizUHy
nUkIVAO8iiXrprxbPQ5L6rFapkCJ7GgS9EcdCbu9AoGAeKRGqkl2mnkeEA97NTKA
fPOKQzyNtMBr3f+GGXhgsdnqWT5pUksWryNRn6RJRYmJeElzPMakZNi14WCUu+0I
Or6SvYB8pLlDOmsIaZYaEjghpGR+Cg6WeHZhfpOWdPr/vR7Wz0B1md1e9KRPnUqB
2VHSXJJQ/Q0BP7dZO5f6udUCgYEArXb34FK54gIBtzipa8cp5ORoxOn6r1LnjqiS
CDKNRs3ymDj5jK63blSHcfrI7DTxf5vJCJ+JL5NA/b02317Vbw0hzRBZ6llY30v4
/5Onkae1oYkuQqzAPz13YU9ODTBX3nHDs+iwDBjaO7fsdkCNnOW+1z2oqgYMy+zn
6/mpWHECgYEAsSOuHFbBoSla5J4oHGxpCglA+2fYLCEHu1RGObqA6fehWm7+XbIG
ob9TfpG6cWJksqdS34Rc7hRNUQMo5/KQ7Rx5BwqJRc881TDN8QuslIhDYxk5FfgC
TfPvTi9K/MGzRKJk1zjiu+KP5EzG2k9MtUBvuXc/Ba79aPKBPangckw=
-----END RSA PRIVATE KEY-----
+0 −20
Original line number Diff line number Diff line
-----BEGIN CERTIFICATE-----
MIIDLjCCAhagAwIBAgIBATANBgkqhkiG9w0BAQUFADA3MREwDwYDVQQLDAhTZWN1
cml0eTEUMBIGA1UEAwwLTkRHIFRlc3QgQ0ExDDAKBgNVBAoMA05ERzAeFw0xNTAx
MjExNDMzMThaFw0yMDAxMjAxNDMzMThaMDcxETAPBgNVBAsMCFNlY3VyaXR5MRQw
EgYDVQQDDAtOREcgVGVzdCBDQTEMMAoGA1UECgwDTkRHMIIBIjANBgkqhkiG9w0B
AQEFAAOCAQ8AMIIBCgKCAQEArq4QKUTRq45nCDR/p+OlHIIN8+ugUbiCfteazbTG
rX8vIQ9HxSuz/xvxTw+E0KgA4YSK2SJJP4QiCjlMKYS3Rt8o361GNtnRmeo5qyBu
GMSv73XL1uuqumggUZyrhhksckR7gyNFnKVXzZjAQPepsT0xBjs5uEAEqXJzAf+r
24AnT3MZRh7gsyEe3sZjd75kZVwcrWhrocyKlMCR77yEr+uP4pg+dEMhDMKKxlaF
C5RPMotOpWm/7AToHrGia34WSmcxvuOwxOkI4xEW6mxWMaVTBCXUh6Wb/0m/x8Nv
9VvS2UBC4sCp4MqlDpySxQpT1RgrhMTEmtUOh50l4eEhdwIDAQABo0UwQzASBgNV
HRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUkEvQjGOP
Oj5DZEvsm96AdiiFXWgwDQYJKoZIhvcNAQEFBQADggEBAGD0kQASmNzvtYL+JUGf
gTPyJhADl9Ai9GvZJsY/wX0IRTxRl5y08Dqlg3qyGG3GzL918cr1sVCYnLepNQES
T0MIz50DCKGryNSc74JHPDxpYaSV6whmNH5iwh8fy6tmJwF3FWbGXD2ddc+ofJqP
WPPJtzqxuuJ6iXQIFqD9mEn3iXVcvFuSzpdpH9paORTKB0j4gya9zctB8LP0ZXIE
//wREc+4msnmoTn+qkFAOPBg9WnvoipfyCXPgbTagxlofVjZ7gAgYIefqhXBTQdd
5tnYdyQQBRcUXQS2bBX03q8ftcxOjc3SvXI4MvrqofuFPwu4GnrspnC0KQYlXwEI
7ds=
-----END CERTIFICATE-----
+0 −20
Original line number Diff line number Diff line
-----BEGIN CERTIFICATE-----
MIIDLjCCAhagAwIBAgIBATANBgkqhkiG9w0BAQUFADA3MREwDwYDVQQLDAhTZWN1
cml0eTEUMBIGA1UEAwwLTkRHIFRlc3QgQ0ExDDAKBgNVBAoMA05ERzAeFw0xNTAx
MjExNDMzMThaFw0yMDAxMjAxNDMzMThaMDcxETAPBgNVBAsMCFNlY3VyaXR5MRQw
EgYDVQQDDAtOREcgVGVzdCBDQTEMMAoGA1UECgwDTkRHMIIBIjANBgkqhkiG9w0B
AQEFAAOCAQ8AMIIBCgKCAQEArq4QKUTRq45nCDR/p+OlHIIN8+ugUbiCfteazbTG
rX8vIQ9HxSuz/xvxTw+E0KgA4YSK2SJJP4QiCjlMKYS3Rt8o361GNtnRmeo5qyBu
GMSv73XL1uuqumggUZyrhhksckR7gyNFnKVXzZjAQPepsT0xBjs5uEAEqXJzAf+r
24AnT3MZRh7gsyEe3sZjd75kZVwcrWhrocyKlMCR77yEr+uP4pg+dEMhDMKKxlaF
C5RPMotOpWm/7AToHrGia34WSmcxvuOwxOkI4xEW6mxWMaVTBCXUh6Wb/0m/x8Nv
9VvS2UBC4sCp4MqlDpySxQpT1RgrhMTEmtUOh50l4eEhdwIDAQABo0UwQzASBgNV
HRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUkEvQjGOP
Oj5DZEvsm96AdiiFXWgwDQYJKoZIhvcNAQEFBQADggEBAGD0kQASmNzvtYL+JUGf
gTPyJhADl9Ai9GvZJsY/wX0IRTxRl5y08Dqlg3qyGG3GzL918cr1sVCYnLepNQES
T0MIz50DCKGryNSc74JHPDxpYaSV6whmNH5iwh8fy6tmJwF3FWbGXD2ddc+ofJqP
WPPJtzqxuuJ6iXQIFqD9mEn3iXVcvFuSzpdpH9paORTKB0j4gya9zctB8LP0ZXIE
//wREc+4msnmoTn+qkFAOPBg9WnvoipfyCXPgbTagxlofVjZ7gAgYIefqhXBTQdd
5tnYdyQQBRcUXQS2bBX03q8ftcxOjc3SvXI4MvrqofuFPwu4GnrspnC0KQYlXwEI
7ds=
-----END CERTIFICATE-----
Loading