Skip to content
Snippets Groups Projects
Commit f70057dd authored by Christian Boettcher's avatar Christian Boettcher
Browse files

Merge branch 'master' into noroot

parents 7cfe6d20 35bd9b54
No related branches found
No related tags found
1 merge request!7no root in dockerfile
Pipeline #91594 passed
...@@ -58,7 +58,7 @@ light-deploy-testing: ...@@ -58,7 +58,7 @@ light-deploy-testing:
<<: *ssh_setup <<: *ssh_setup
environment: Testing environment: Testing
script: script:
- ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN "cd /home/apiserver/datacatalog && sudo git stash && sudo git pull --all && sudo git checkout -f $CI_COMMIT_TAG && sudo git stash clear" - ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN "cd /home/apiserver/datacatalog && sudo git stash && sudo git checkout master && sudo git pull --all && sudo git checkout -f $CI_COMMIT_TAG && sudo git stash clear"
- ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN "sudo /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $TESTING_URL $TESTING_DOMAIN" - ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN "sudo /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $TESTING_URL $TESTING_DOMAIN"
light-deploy-production: light-deploy-production:
...@@ -72,7 +72,7 @@ light-deploy-production: ...@@ -72,7 +72,7 @@ light-deploy-production:
<<: *ssh_setup <<: *ssh_setup
environment: Production environment: Production
script: script:
- ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "cd /home/apiserver/datacatalog && sudo git stash && sudo git pull --all && sudo git checkout -f $CI_COMMIT_TAG && sudo git stash clear" - ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "cd /home/apiserver/datacatalog && sudo git stash && sudo git checkout master && sudo git pull --all && sudo git checkout -f $CI_COMMIT_TAG && sudo git stash clear"
- ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "sudo SECRETS_ENCRYPTION_KEY=$SECRETS_ENCRYPTION_KEY, /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $PRODUCTION_URL $PRODUCTION_DOMAIN" - ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "sudo SECRETS_ENCRYPTION_KEY=$SECRETS_ENCRYPTION_KEY, /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $PRODUCTION_URL $PRODUCTION_DOMAIN"
full-deploy-production: full-deploy-production:
...@@ -96,10 +96,11 @@ full-deploy-production: ...@@ -96,10 +96,11 @@ full-deploy-production:
- sleep 10 # ensure that next command reaches the new server, prevents host key problems - sleep 10 # ensure that next command reaches the new server, prevents host key problems
# TODO move local zip of certificate-docker-volume to server once startup is complete # TODO move local zip of certificate-docker-volume to server once startup is complete
- openstack server add volume $INSTANCE_ID $VOLUME_ID - openstack server add volume $INSTANCE_ID $VOLUME_ID
- ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "sudo mkdir -p /mnt" - sleep 20 # apparently it may take some time until the volume is available to the OS
- ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "sudo mount /dev/vdb1 /mnt" - ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "sudo mkdir -p /app/mnt"
- ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "sudo mount /dev/vdb1 /app/mnt"
- until ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN ls /finished_cloudinit >/dev/null 2>&1; do sleep 30; done # wait until cloudinit script is complete - until ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN ls /finished_cloudinit >/dev/null 2>&1; do sleep 30; done # wait until cloudinit script is complete
- SECRETS_ENCRYPTION_KEY=$SECRETS_ENCRYPTION_KEY, /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $PRODUCTION_URL $PRODUCTION_DOMAIN - ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "sudo SECRETS_ENCRYPTION_KEY=$SECRETS_ENCRYPTION_KEY, /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $PRODUCTION_URL $PRODUCTION_DOMAIN"
full-deploy-testing: full-deploy-testing:
stage: deploy stage: deploy
...@@ -121,7 +122,7 @@ full-deploy-testing: ...@@ -121,7 +122,7 @@ full-deploy-testing:
- sleep 10 # ensure that next command reaches the new server, prevents host key problems - sleep 10 # ensure that next command reaches the new server, prevents host key problems
# TODO move local zip of certificate-docker-volume to server once startup is complete # TODO move local zip of certificate-docker-volume to server once startup is complete
- until ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN ls /finished_cloudinit >/dev/null 2>&1; do sleep 30; done # wait until cloudinit script is complete - until ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN ls /finished_cloudinit >/dev/null 2>&1; do sleep 30; done # wait until cloudinit script is complete
- /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $TESTING_URL $TESTING_DOMAIN - ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "sudo /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $TESTING_URL $TESTING_DOMAIN"
cleanup-failed-full-deployment: cleanup-failed-full-deployment:
...@@ -246,9 +247,9 @@ publishgit-do: ...@@ -246,9 +247,9 @@ publishgit-do:
- apt-get install -y git - apt-get install -y git
- (git remote -v | grep gith) || git remote add gith "https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/eflows4hpc/datacatalog.git" - (git remote -v | grep gith) || git remote add gith "https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/eflows4hpc/datacatalog.git"
- git remote -v - git remote -v
- git show-ref - git fetch --unshallow origin
- export - git push gith +HEAD:refs/heads/master
- git push gith $CI_COMMIT_REF_NAME
# This is an automatic push of the docker image into gitLab container repository # This is an automatic push of the docker image into gitLab container repository
......
...@@ -187,6 +187,15 @@ async def get_dataset_secret(location_data_type: LocationDataType, ...@@ -187,6 +187,15 @@ async def get_dataset_secret(location_data_type: LocationDataType,
log.debug("Authenticed User: '%s' listed the secret %s of /%s/%s", user.username, key, location_data_type.value, dataset_id) log.debug("Authenticed User: '%s' listed the secret %s of /%s/%s", user.username, key, location_data_type.value, dataset_id)
return adapter.get_secret(location_data_type, dataset_id, key, user) return adapter.get_secret(location_data_type, dataset_id, key, user)
# differs from .../secrets by also returning the values in a dict
@app.get("/{location_data_type}/{dataset_id}/secrets_values")
@secrets_required
async def list_dataset_secrets(location_data_type: LocationDataType, dataset_id: UUID4, user: User = Depends(my_user)):
"""list the secrets and valuesof a specific dataset"""
log.debug("Authenticed User: '%s' listed the secrets (key and value) of /%s/%s", user.username, location_data_type.value, dataset_id)
return adapter.get_secret_values(location_data_type, dataset_id, user)
@app.post("/{location_data_type}/{dataset_id}/secrets") @app.post("/{location_data_type}/{dataset_id}/secrets")
@secrets_required @secrets_required
async def add_update_dataset_secret(location_data_type: LocationDataType, async def add_update_dataset_secret(location_data_type: LocationDataType,
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: auto; height: auto;
background-image: url('../img/Barra-gris-footer.png'); background-image: url('../img/grey-bar-footer.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
} }
div.eflows-line { div.eflows-line {
background-image: url('../img/barra-3-color-8.png') !important; background-image: url('../img/colourful-bar.png') !important;
height: 15px; height: 15px;
width: 100%; width: 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
......
frontend/img/BMBF_gefoerdert_2017_en.jpg

70.5 KiB

File moved
frontend/img/eu-flag.png

411 B

File moved
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
{% block extraheader %}{% endblock %} {% block extraheader %}{% endblock %}
</head> </head>
{% block body %} {% block body %}
<div class="d-flex flex-column min-vh-100">
<!--BIG TITLE WITH LOGO--> <!--BIG TITLE WITH LOGO-->
<div class="jumbotron text-center" style="margin-bottom:0"> <div class="jumbotron text-center" style="margin-bottom:0">
<h1>eFlows4HPC Data Catalog</h1> <h1>eFlows4HPC Data Catalog</h1>
...@@ -37,20 +38,20 @@ ...@@ -37,20 +38,20 @@
</div> </div>
</nav> </nav>
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
</ul> </ul>
<!--SPECIFIC PAGE CONTENT--> <!--SPECIFIC PAGE CONTENT-->
<div class="d-flex flex-column min-vh-75">
{% block content%} {% block content%}
{% endblock %} {% endblock %}
</div>
<div class="flex-grow-1"></div>
<!--FOOTER--> <!--FOOTER-->
{% block footer %} {% block footer %}
{% include 'footer.html.jinja' %} {% include 'footer.html.jinja' %}
{% endblock %} {% endblock %}
</div>
<!--SHARED JAVASCRIPT--> <!--SHARED JAVASCRIPT-->
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{% endblock %} {% endblock %}
{% block footer %} {% block footer %}
<footer class="footer d-inlign-flex"> <footer class="footer mt-auto flex-shrink-0 d-inlign-flex">
<div class="container-fluid p-0"> <div class="container-fluid p-0">
<div class="eflows-line"></div> <div class="eflows-line"></div>
<div class="row mt-2 px-3"> <div class="row mt-2 px-3">
...@@ -17,10 +17,15 @@ ...@@ -17,10 +17,15 @@
<a href="https://github.com/eflows4hpc/datacatalog"><i class="fa fa-github-square mr-2 fa-2x text-white"></i></a> <a href="https://github.com/eflows4hpc/datacatalog"><i class="fa fa-github-square mr-2 fa-2x text-white"></i></a>
</p> </p>
</div> </div>
<div class="col-lg-6 col-12 d-inlign-flex"> <div class="col-lg-1 col-6 d-inlign-flex">
<p class="text-center align-self-center">
<img loading="lazy" src="img/BMBF_gefoerdert_2017_en.jpg" alt="Funded by BMBF" style="max-height:100px">
</p>
</div>
<div class="col-lg-5 col-12 d-inlign-flex">
<p class="m-2 align-self-center text-white"> <p class="m-2 align-self-center text-white">
<span class="mr-3 mt-1 float-left"> <span class="mr-3 mt-1 float-left">
<img loading="lazy" src="https://eflows4hpc.eu/wp-content/uploads/2021/01/bandera-8.png" alt="" style="max-width:52px; max-height:34px"> <img loading="lazy" src="img/eu-flag.png" alt="" style="max-width:52px; max-height:34px">
</span> </span>
<small style="display: flow-root">This work has been supported by the eFlows4HPC project, contract #955558. This project has received funding from the European High-Performance Computing Joint Undertaking (JU) under grant agreement No 955558.<br>The JU receives support from the European Union’s Horizon 2020 research and innovation programme and Spain, Germany, France, Italy, Poland, Switzerland, Norway. <small style="display: flow-root">This work has been supported by the eFlows4HPC project, contract #955558. This project has received funding from the European High-Performance Computing Joint Undertaking (JU) under grant agreement No 955558.<br>The JU receives support from the European Union’s Horizon 2020 research and innovation programme and Spain, Germany, France, Italy, Poland, Switzerland, Norway.
<strong> <strong>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment