Skip to content

Commit

Permalink
global: cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
mojib committed Nov 25, 2024
1 parent 6023d54 commit d91f430
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 790 deletions.
40 changes: 4 additions & 36 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}-mug
labels: ${{ steps.meta.outputs.labels }}-mug

build-publish-kfu:
build-publish-theme:
runs-on: ubuntu-20.04
permissions:
contents: read
Expand All @@ -102,39 +102,7 @@ jobs:
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
file: Dockerfile.kfu
file: Dockerfile.theme
push: true
tags: ${{ steps.meta.outputs.tags }}-kfu
labels: ${{ steps.meta.outputs.labels }}-kfu

build-publish-aris:
runs-on: ubuntu-20.04
permissions:
contents: read
packages: write

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
file: Dockerfile.aris
push: true
tags: ${{ steps.meta.outputs.tags }}-aris
labels: ${{ steps.meta.outputs.labels }}-aris
tags: ${{ steps.meta.outputs.tags }}-theme
labels: ${{ steps.meta.outputs.labels }}-theme
38 changes: 0 additions & 38 deletions Dockerfile.aris

This file was deleted.

6 changes: 1 addition & 5 deletions Dockerfile.kfu → Dockerfile.theme
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ RUN pip install --upgrade pip && \
pip install git+https://github.com/sharedRDM/invenio-override.git@main
# pip install "invenio-override>=0.0.3"

# COPY variables.less
# TODO: Using ARG change directory of variables.less
COPY themes/KFU/variables.less /usr/local/lib/python3.9/site-packages/invenio_override/assets/semantic-ui/less/invenio_override/variables.less

COPY ./docker/uwsgi/ ${INVENIO_INSTANCE_PATH}
COPY ./themes/KFU/invenio.cfg ${INVENIO_INSTANCE_PATH}
COPY ./invenio.cfg ${INVENIO_INSTANCE_PATH}
COPY ./templates/ ${INVENIO_INSTANCE_PATH}/templates/
COPY ./app_data/ ${INVENIO_INSTANCE_PATH}/app_data/
COPY ./translations/ ${INVENIO_INSTANCE_PATH}/translations/
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,12 @@ Following is an overview of the generated files and folders:

To learn how to configure, customize, deploy and much more, visit
the [InvenioRDM Documentation](https://inveniordm.docs.cern.ch/).


## Docker Images

| Name | Description |
|---|---|
| ``Dockerfile`` | Dockerfile used to build base image, without theme. |
| ``Dockerfile.mug`` | Dockerfile used to build MUG image. |
| ``Dockerfile.theme`` | Dockerfile used to build default override theme image. |
56 changes: 28 additions & 28 deletions invenio.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -233,32 +233,32 @@ THEME_SHOW_FRONTPAGE_INTRO_SECTION = False
# Invenio-Override
# --------------

# # LOGO
#INVENIO_OVERRIDE_LOGO=images/MUG.svg
OVERRIDE_LOGO = "images/MUG.svg"
"""override logo"""

#INVENIO_OVERRIDE_FAVICON=mug.ico
OVERRIDE_FAVICON = "mug.ico"
"""override favicon"""

#INVENIO_OVERRIDE_PRODUCTION=True
OVERRIDE_PRODUCTION = True
"""Enable/Disable notice."""

#INVENIO_OVERRIDE_ICON=images/icon_use.png
OVERRIDE_ICON = "images/icon_use.png"
"""Icon used in login page"""

#INVENIO_OVERRIDE_CONTACT_FORM=False
OVERRIDE_CONTACT_FORM = False
"""Enable/Disable Contact form."""

#INVENIO_OVERRIDE_SHIBBOLETH=False
OVERRIDE_SHIBBOLETH = False
"""Set True if SAML is configured"""

#INVENIO_OVERRIDE_FRONTPAGE_RIGHT=False
OVERRIDE_FRONTPAGE_RIGHT = True
"""Frontpage right section"""
# # # LOGO
# #INVENIO_OVERRIDE_LOGO=images/MUG.svg
# OVERRIDE_LOGO = "images/MUG.svg"
# """override logo"""

# #INVENIO_OVERRIDE_FAVICON=mug.ico
# OVERRIDE_FAVICON = "mug.ico"
# """override favicon"""

# #INVENIO_OVERRIDE_PRODUCTION=True
# OVERRIDE_PRODUCTION = True
# """Enable/Disable notice."""

# #INVENIO_OVERRIDE_ICON=images/icon_use.png
# OVERRIDE_ICON = "images/icon_use.png"
# """Icon used in login page"""

# #INVENIO_OVERRIDE_CONTACT_FORM=False
# OVERRIDE_CONTACT_FORM = False
# """Enable/Disable Contact form."""

# #INVENIO_OVERRIDE_SHIBBOLETH=False
# OVERRIDE_SHIBBOLETH = False
# """Set True if SAML is configured"""

# #INVENIO_OVERRIDE_FRONTPAGE_RIGHT=False
# OVERRIDE_FRONTPAGE_RIGHT = True
# """Frontpage right section"""

Loading

0 comments on commit d91f430

Please sign in to comment.