Skip to content

Commit 6eaf936

Browse files
pmustonebipmustonebi
committed
Merge branch 'master' into release-25
2 parents 5fc7077 + a83c651 commit 6eaf936

File tree

11 files changed

+99
-13
lines changed

11 files changed

+99
-13
lines changed

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ manual_deployment_to_fallback:
101101

102102
manual_deployment_to_test:
103103
stage: deploy
104-
image:
105-
name: rnacentral/rnacentral-ci-cd
104+
image: ghcr.io/rnacentral/rna-central-ci-cd:3.20-alpine
106105
<<: [*deploy_steps, *variables_test]
107106
rules:
108107
- if: '$CI_PIPELINE_SOURCE == "web" && $DEPLOY == "test"'

‎Dockerfile-CI-CD‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1+
#-------------------------------------------------------------------------------
2+
# To avoid rate limit issues with GitLab and DockerHub, push the CI-CD image to GHCR.
3+
# Current GHCR limit:
4+
# - 100 pulls per 6 hours per IP address for anonymous users.
5+
# - Unlimited pulls for users authenticated with a GitHub account and a valid PAT
6+
#
7+
# Commands to build and push:
8+
#
9+
# docker buildx create --use
10+
# docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/rnacentral/ci-cd:3.20-alpine -f Dockerfile-CI-CD --push .
11+
#
12+
#-------------------------------------------------------------------------------
113
# Build container with kubectl and helm to be used by GitLab CI/CD
214

3-
ARG BUILDPLATFORM
4-
FROM ${BUILDPLATFORM}alpine:3.20
15+
FROM arm64v8/alpine:3.14
516

617
ARG TARGETOS
718
ARG TARGETARCH

‎entrypoint.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,10 @@ else
6565
chown -R rnacentral "${RNACENTRAL_HOME}"/rnacentral/rnacentral/local_settings.py
6666
fi
6767

68-
# Run collectstatic only if static files are missing
69-
if [ -z "$(ls -A /srv/rnacentral/static)" ]; then
70-
echo "INFO: Collecting static files..."
71-
python "${RNACENTRAL_HOME}"/rnacentral/manage.py collectstatic --noinput
72-
else
73-
echo "INFO: Static files already present, skipping collectstatic."
74-
fi
68+
69+
echo "INFO: Collecting static files..."
70+
python "${RNACENTRAL_HOME}"/rnacentral/manage.py collectstatic --noinput
71+
7572

7673
# Run django compressor
7774
echo "INFO: Running django compress"

‎rnacentral/portal/management/commands/create_sitemaps.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,13 @@ def items(self):
109109
"help-secondary-structure",
110110
"help-sequence-search",
111111
"help-text-search",
112+
"help-team",
112113
"help",
113114
"homepage",
114115
"license",
115116
"linking-to-rnacentral",
116117
"sequence-search",
117-
"training",
118+
"training"
118119
]
119120

120121
def location(self, item):

‎rnacentral/portal/static/privacy-notice.pdf‎

336 KB
Binary file not shown.

‎rnacentral/portal/templates/portal/base.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142

143143
</div> <!-- container -->
144144

145-
<div id="data-protection-message-configuration" data-message="This website requires cookies and limited processing of your personal data in order to function. By using this site you are agreeing to this as outlined in our <a class='white-color' href='https://www.ebi.ac.uk/data-protection/privacy-notice/rnacentral'>Privacy Policy</a> and <a href='https://www.ebi.ac.uk/about/terms-of-use'>Terms of Use</a>." data-service-id="myService" data-data-protection-version="0.1"></div>
145+
<div id="data-protection-message-configuration" data-message="This website requires cookies and limited processing of your personal data in order to function. By using this site you are agreeing to this as outlined in our <a class='white-color' href='{% static "privacy-notice.pdf" %}'>Privacy Policy</a> and <a href='https://www.ebi.ac.uk/about/terms-of-use'>Terms of Use</a>." data-service-id="myService" data-data-protection-version="0.1"></div>
146146

147147

148148
{% compress js %}

‎rnacentral/portal/templates/portal/docs/team.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
# Meet the Team
3+
4+
### Current members
5+
6+
The [RNAcentral](/) database is curated and maintained at the [European Bioinformatics Institute](https://www.ebi.ac.uk/) in Cambridge, UK.
7+
8+
- [Blake Sweeney](https://www.ebi.ac.uk/people/person/blake-sweeney/) - Project Leader
9+
- [Alex Bateman](https://www.ebi.ac.uk/people/person/alex-bateman/) - Group Team Leader
10+
- [Carlos Ribas](https://www.ebi.ac.uk/people/person/carlos-eduardo-ribas/) - Full Stack Developer
11+
- [Philippa Muston](https://www.ebi.ac.uk/people/person/philippa-muston/) - Full Stack Developer
12+
- [Andrew Green](https://www.ebi.ac.uk/people/person/andrew-green/) - ARISE fellow
13+
14+
### Previous members
15+
16+
- [Anton Petrov](https://antonpetrov.com/) - Project Leader
17+
- Boris Burkov - Software Developer

‎rnacentral/portal/templates/portal/help/sidebar.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ <h3>Help topics</h3>
99
<li><a href="{% url 'training' %}">Training resources</a></li>
1010
<li><a href="{% url 'about' %}#growth-chart">Data growth timeline</a></li>
1111
<li><a href="{% url 'linking-to-rnacentral' %}">Linking to RNAcentral</a></li>
12+
<li><a href="{% url 'help-team' %}">Meet the Team</a></li>
1213
<strong>Data Access</strong>
1314
<li><a href="{% url 'help-text-search' %}">Text search</a></li>
1415
<li><a href="{% url 'help-sequence-search' %}">Sequence search</a></li>

‎rnacentral/portal/templates/portal/help/team.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!--
2+
Copyright [2009-2017] EMBL-European Bioinformatics Institute
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
http://www.apache.org/licenses/LICENSE-2.0
7+
Unless required by applicable law or agreed to in writing, software
8+
distributed under the License is distributed on an "AS IS" BASIS,
9+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
See the License for the specific language governing permissions and
11+
limitations under the License.
12+
-->
13+
14+
{% extends "portal/base.html" %}
15+
16+
{% block meta_tags %}
17+
{{ block.super }}
18+
<meta name="description" content="Meet the Team"/>
19+
<meta name="twitter:description" content="Meet the Team"/>
20+
{% endblock %}
21+
22+
{% block title %}
23+
Meet the Team
24+
{% endblock %}
25+
26+
{% block content %}
27+
28+
<div class="row">
29+
30+
<div class="col-md-8">
31+
{% load markdown_deux_tags %}
32+
{% markdown %}
33+
{% include 'portal/docs/team.md' %}
34+
{% endmarkdown %}
35+
36+
<hr>
37+
38+
<a class="btn btn-default btn-sm" title="Edit on GitHub" href="https://github.com/RNAcentral/rnacentral-webcode/edit/master/rnacentral/portal/templates/portal/docs/link-to-rnacentral.md" target="_blank"><i class="fa fa-pencil-square-o"></i> Improve this page</a>
39+
</div>
40+
41+
<div class="col-md-4">
42+
{% include 'portal/help/sidebar.html' %}
43+
</div>
44+
45+
</div>
46+
47+
<br>
48+
49+
{% endblock %}

‎rnacentral/portal/tests/test_views.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@ def test_help_galaxy_status_code(self):
235235
response = self.client.get(reverse("help-galaxy"))
236236
self.assertEqual(response.status_code, 200)
237237

238+
def test_help_team_status_code(self):
239+
response = self.client.get(reverse("help-team"))
240+
self.assertEqual(response.status_code, 200)
241+
238242
########################
239243
# training, about-us, api, contact, thanks, error
240244
########################

0 commit comments

Comments
 (0)