Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .github/workflows/_ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,22 @@ jobs:
run: |
IMAGE_TAG_VERSION=${{inputs.base_image_name}}:${{inputs.image_tag}}
IMAGE_TAG_LASTEST=${{inputs.base_image_name}}:latest
echo image_tag_version $IMAGE_TAG_VERSION
docker build -t $IMAGE_TAG_VERSION -t $IMAGE_TAG_LASTEST -f ${{inputs.dockerfile}} ${{inputs.docker_context}}
echo "{image_build}={$IMAGE_TAG_VERSIONvalue}" >> $GITHUB_OUTPUT

echo "Build image: $IMAGE_TAG_VERSION and pass APP_VERSION=${{inputs.image_tag}}"

echo "docker build -t $IMAGE_TAG_VERSION -t $IMAGE_TAG_LATEST --build-arg APP_VERSION=${{inputs.image_tag}} -f ${{inputs.dockerfile}} ${{inputs.docker_context}}"
docker build -t $IMAGE_TAG_VERSION -t $IMAGE_TAG_LATEST --build-arg APP_VERSION=${{inputs.image_tag}} -f ${{inputs.dockerfile}} ${{inputs.docker_context}}

echo "image_build=$IMAGE_TAG_VERSION" >> $GITHUB_OUTPUT

- name: push to ghcr.io
id: push_image
run: |
echo login
echo "Logging in to GHCR..."

echo "${{secrets.token}}" | docker login https://ghcr.io -u ${{inputs.ghcr_user}} --password-stdin
echo push auth image with all tags
docker push ${{inputs.base_image_name}} --all-tags
echo "{image_build}={$IMAGE_TAG_VERSIONvalue}" >> $GITHUB_OUTPUT

echo "image_pushed=true" >> $GITHUB_OUTPUT

60 changes: 60 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,66 @@ jobs:
echo skipped=${{needs.release_tag.outputs.skipped}}
echo tag=${{needs.release_tag.outputs.tag}}

auth:
# it needs to be checked on string value
if: needs.release_tag.outputs.skipped == 'false'
needs: release_tag
name: auth
uses: ./.github/workflows/_ghcr.yml
with:
ghcr_user: ${{github.actor}}
base_image_name: ghcr.io/research-software-directory/kin-rpd/auth
image_tag: ${{needs.release_tag.outputs.tag}}
dockerfile: authentication/Dockerfile
docker_context: ./authentication
secrets:
token: ${{secrets.GITHUB_TOKEN}}

database:
# it needs to be checked on string value
if: needs.release_tag.outputs.skipped == 'false'
needs: release_tag
name: database
uses: ./.github/workflows/_ghcr.yml
with:
ghcr_user: ${{github.actor}}
base_image_name: ghcr.io/research-software-directory/kin-rpd/database
image_tag: ${{needs.release_tag.outputs.tag}}
dockerfile: database/Dockerfile
docker_context: ./database
secrets:
token: ${{secrets.GITHUB_TOKEN}}

backend:
# it needs to be checked on string value
if: needs.release_tag.outputs.skipped == 'false'
needs: release_tag
name: backend api
uses: ./.github/workflows/_ghcr.yml
with:
ghcr_user: ${{github.actor}}
base_image_name: ghcr.io/research-software-directory/rsd-saas/backend
image_tag: ${{needs.release_tag.outputs.tag}}
dockerfile: backend-postgrest/Dockerfile
docker_context: ./backend-postgrest
secrets:
token: ${{secrets.GITHUB_TOKEN}}

background-services:
# it needs to be checked on string value
if: needs.release_tag.outputs.skipped == 'false'
needs: release_tag
name: background services
uses: ./.github/workflows/_ghcr.yml
with:
ghcr_user: ${{github.actor}}
base_image_name: ghcr.io/research-software-directory/kin-rpd/background-services
image_tag: ${{needs.release_tag.outputs.tag}}
dockerfile: background-services/Dockerfile
docker_context: ./background-services
secrets:
token: ${{secrets.GITHUB_TOKEN}}

frontend:
# it needs to be checked on string value
if: needs.release_tag.outputs.skipped == 'false'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export DGID
# ----------------------------------------------------------------
start: clean
docker compose build # build all services
docker compose up --scale data-generation=1 --scale scrapers=0 --detach
docker compose up --scale data-generation=1 --detach
# open http://localhost to see the application running

install: clean
Expand Down
17 changes: 0 additions & 17 deletions background-services/Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions background-services/README.md

This file was deleted.

83 changes: 0 additions & 83 deletions background-services/pom.xml

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions background-services/src/main/resources/logback.xml

This file was deleted.

6 changes: 3 additions & 3 deletions data-generation/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions deployment/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ LINKEDIN_WELL_KNOWN_URL=https://www.linkedin.com/oauth/.well-known/openid-config
# max requests to the GitHub API per run, runs 10 times per hour
# optional, comment out if not available, a default of 6 will be used
# consumed by: scrapers
MAX_REQUESTS_GITHUB=6
MAX_REQUESTS_GITHUB=0

# max request to GitLab API per run, runs 10 times per hour
# optional, comment out if not available, a default of 6 will be used
# consumed by: scrapers
MAX_REQUESTS_GITLAB=6
MAX_REQUESTS_GITLAB=0

# max mentions to scrape per run, runs 10 times per hour
# optional, comment out if not available, a default of 6 will be used
Expand All @@ -140,6 +140,11 @@ MAX_REQUESTS_DOI=6
# consumed by: scrapers
MAX_REQUESTS_ROR=6

# max reference papers of which to scrape citations per run, runs 10 times per hour
# optional, comment out if not available, a default of 6 will be used
# consumed by: scrapers
MAX_REQUESTS_OPENALEX=6

# ---- SECRETS ------ SECRETS -----------

# consumed by services: database
Expand Down Expand Up @@ -194,3 +199,6 @@ MATOMO_ID=

# consumed by: scrapers
# LIBRARIES_IO_ACCESS_TOKEN=

# See https://developers.openalex.org/guides/authentication for more information
OPENALEX_API_KEY=
Loading
Loading