Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Poc #40

Open
wants to merge 50 commits into
base: main
Choose a base branch
from
Open

Poc #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
6bda3d4
simple test with with staging data
areedv Sep 9, 2022
5391775
poc adjustments
areedv Sep 9, 2022
7ae5102
define default user group internally
areedv Sep 16, 2022
1270686
in dev, for sure
areedv Sep 16, 2022
8a7b601
simplify user widget
areedv Sep 20, 2022
8f4371e
main tag for now
areedv Sep 20, 2022
0983160
port that wits witn dev combo
areedv Sep 20, 2022
525db37
Merge branch 'poc' of github:Rapporteket/ablanor into poc
areedv Sep 20, 2022
bea7e0c
no need, as of now
areedv Sep 27, 2022
b2fd2fa
Merge branch 'poc' of github:rapporteket/ablanor into poc
areedv Sep 27, 2022
65a32e9
under construction
areedv Oct 3, 2022
2149be1
reactive user data
areedv Oct 7, 2022
316d9b1
still under construction
areedv Oct 7, 2022
695c6c7
use new widget module
areedv Oct 10, 2022
4b8e59f
temporary report, for tesing
areedv Nov 22, 2022
fe4d62a
pause test of staging data
areedv Nov 22, 2022
31f7afd
need testing of pdf chain
areedv Nov 23, 2022
2076ea9
first take on staging with a db backend
areedv Dec 8, 2022
1cd8998
container env
areedv Nov 22, 2022
f4605b4
for the test of it
areedv Nov 22, 2022
0710a07
stack manager tool
areedv Nov 23, 2022
9493a88
extend roles
areedv Dec 8, 2022
33fe3b4
whatever
areedv Dec 14, 2022
9ebae60
debug enc
areedv Dec 15, 2022
cbc96ae
Merge branch 'poc' of github:rapporteket/ablanor into poc
areedv Dec 15, 2022
07f2520
clean-up after debug
areedv Dec 16, 2022
fff7f0c
for live deploy demo
areedv Jan 31, 2023
9cf3315
Merge branch 'main' into poc
arnfinn Dec 5, 2024
da7ef6f
dev-stuff
arnfinn Dec 6, 2024
0b1d005
run_app med json-logg og åpning i browser, hvis man vil
arnfinn Dec 10, 2024
37f7711
noe mer dev-greier
arnfinn Dec 10, 2024
264e8ce
Dropp testing av staging-data i veiledning.
arnfinn Dec 10, 2024
b08f9fc
Fjerne shinyalert
arnfinn Dec 10, 2024
39b957d
La autoreport fungere
arnfinn Dec 10, 2024
642ade6
Dropp test av getProsPatient. Funksjonen finnes ikke lenger
arnfinn Dec 10, 2024
e646fc1
fix lintr-fil
arnfinn Dec 10, 2024
531143c
autoreport_db-branch av rapbase
arnfinn Dec 10, 2024
5c96659
doc
arnfinn Dec 10, 2024
232f868
Merge branch 'main' into poc
arnfinn Jan 22, 2025
24f1575
Bruk main-versjon av rapbase
arnfinn Jan 22, 2025
9e5f05b
Tilpass docker-image (brukerrettigheter)
arnfinn Jan 22, 2025
bee3964
Merge branch 'main' into poc
arnfinn Jan 23, 2025
bb3a14c
FALK-env i test
arnfinn Jan 23, 2025
65f7b3f
map_orgname i mellom orgName og caller...
arnfinn Jan 23, 2025
9d3f2c7
Merge branch 'main' into poc
arnfinn Jan 23, 2025
16d9bca
Navn på enhet i menyen
arnfinn Jan 23, 2025
f5a1079
minor
arnfinn Jan 23, 2025
d8f0379
Harbor-jobb
arnfinn Jan 24, 2025
368a126
Oppdatering av DESCRIPTION
arnfinn Jan 24, 2025
9842f20
Installer latex-pakken xkeyval
arnfinn Jan 28, 2025
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
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
^CODE_OF_CONDUCT\.md$
^data-raw$
^Dockerfile$
^dev$
58 changes: 58 additions & 0 deletions .github/workflows/harbor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Publish Docker image to Harbor
on:
release:
types: [published]
push:
branches:
- main
pull_request:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
name: Push Docker image to Harbor
runs-on: ubuntu-latest
env:
IMAGE_NAME: ${{ github.repository }}
steps:
- name: Check out the repo
uses: actions/checkout@v4
- name: Lint Dockerfile
uses: hadolint/hadolint-action@v3.1.0
with:
dockerfile: "Dockerfile"
- name: R setup
uses: r-lib/actions/setup-r@v2
- name: Build package (tarball)
run: R CMD build .
- name: Prepare tags
id: docker_meta
uses: docker/metadata-action@v5
with:
images: ${{ env.IMAGE_NAME }}
flavor: |
latest=false
tags: |
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Harbor
if: github.event_name == 'release'
run: |
echo ${{ secrets.HARBOR_PASSWORD }} | docker login --username ${{ secrets.HARBOR_USERNAME }} --password-stdin ${{ secrets.HARBOR_REGISTRY }}
- name: Build image and push to Harbor
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
tags: ${{ secrets.HARBOR_REGISTRY }}/${{ steps.docker_meta.outputs.tags }}
push: ${{ github.event_name == 'release' }}
cache-from: type=gha
cache-to: type=gha,mode=max
11 changes: 8 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: ablanor
Title: AblaNor- Rapporteket
Version: 1.3.3
Version: 2.0.0.9000
Authors@R: c(
person(given = "Kristina",
family = "Skaare",
Expand All @@ -14,7 +14,12 @@ Authors@R: c(
family = "Edvardsen",
role = c("aut"),
email = "biorakel@gmail.com",
comment = c(ORCID = "0000-0002-5210-3656")))
comment = c(ORCID = "0000-0002-5210-3656")),
person(given = "Arnfinn Hykkerud",
family = "Steindal",
role = c("aut"),
email = "arnfinn.hykkerud.steindal@helse-nord.no",
comment = c(ORCID = "0000-0002-4088-7860")))
Description: An implemetation of all R related resources for AblaNor (Nasjonalt register for ablasjonsbehandling og elektrofysiologi i Norge).
License: GPL-3
Encoding: UTF-8
Expand Down Expand Up @@ -44,7 +49,7 @@ Imports:
tidyr,
tidyselect
Remotes:
Rapporteket/rapbase@*release
Rapporteket/rapbase@main
URL: https://github.com/rapporteket/ablanor
BugReports: https://github.com/rapporteket/ablanor/issues
Depends:
Expand Down
18 changes: 12 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
FROM rapporteket/base-r:4.2.1
FROM rapporteket/base-r:main

LABEL maintainer "Are Edvardsen <are.edvardsen@helse-nord.no>"
LABEL maintainer="Arnfinn Hykkerud Steindal <arnfinn.hykkerud.steindal@helse-nord.no>"
LABEL no.rapporteket.cd.enable="true"

WORKDIR /app/R

# hadolint ignore=DL3010
COPY *.tar.gz .

Check failure on line 8 in Dockerfile

View workflow job for this annotation

GitHub Actions / Push Docker image to docker hub

DL3010 info: Use ADD for extracting archives into an image

Check failure on line 8 in Dockerfile

View workflow job for this annotation

GitHub Actions / Push Docker image to docker hub

DL3010 info: Use ADD for extracting archives into an image

RUN R -e "remotes::install_local(list.files(pattern = \"*.tar.gz\"))" \
&& rm ./*.tar.gz
&& rm ./*.tar.gz \
&& R -e "remotes::install_github(\"Rapporteket/rapbase\", ref = \"main\")" \
&& tlmgr update --self && tlmgr install xkeyval

EXPOSE 3008
EXPOSE 3838

CMD ["R", "-e", "options(shiny.port = 3008,shiny.host = \"0.0.0.0\"); ablanor::run_app()"]
RUN adduser --uid "1000" --disabled-password rapporteket && \
chown -R 1000:1000 /app/R && \
chmod -R 755 /app/R
USER rapporteket

CMD ["R", "-e", "options(shiny.port = 3838, shiny.host = \"0.0.0.0\"); ablanor::run_app()"]
Loading
Loading