Merge branch 'main' into nhn

.github/workflows/docker.yml

@@ -25,7 +25,7 @@ jobs:
       images: ${{ steps.filter.outputs.changes }}
     steps:
     - name: Check out the repo
-      uses: actions/checkout@v4.2.1
+      uses: actions/checkout@v4
     - uses: dorny/paths-filter@v3
       id: filter
       with:
@@ -46,6 +46,11 @@ jobs:
           rapregtemplate-dev: "rapregtemplate-dev/**"
           base-r-alpine: "base-r-alpine/**"
           pilot-dev: "pilot-dev/**"
+          norvas-dev: "norvas-dev/**"
+          rygg-dev: "rygg-dev/**"
+          intensivberedskap-dev: "intensivberedskap-dev/**"
+          ethirgast-dev: "ethirgast-dev/**"
+          kvarus-dev: "kvarus-dev/**"
 
   push_to_registries:
     needs: changes
@@ -58,14 +63,14 @@ jobs:
     name: ${{ matrix.image }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.2.1
+        uses: actions/checkout@v4
       - name: Lint Dockerfile
         uses: hadolint/[email protected]
         with:
           dockerfile: "${{ matrix.image }}/Dockerfile"
       - name: Prepare tags
         id: docker_meta
-        uses: docker/metadata-action@v5.5.1
+        uses: docker/metadata-action@v5
         with:
           images: rapporteket/${{ matrix.image }}
           tags: |
@@ -74,15 +79,15 @@ jobs:
             type=schedule,pattern=weekly
             type=semver,pattern={{version}}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.7.1
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push to Docker Hub
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v6
         with:
           context: ./${{ matrix.image }}/.
           file: ./${{ matrix.image }}/Dockerfile

base-r/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocker/r-ver:4.4.1
 
-LABEL maintainer "Arnfinn Hykkerud Steindal <[email protected]>"
+LABEL maintainer="Arnfinn Hykkerud Steindal <[email protected]>"
 
 # hadolint ignore=DL3008
 RUN apt-get update && apt-get install -y --no-install-recommends \

deformitet-dev/Dockerfile

@@ -1,6 +1,6 @@
 FROM rapporteket/dev:weekly
 
-LABEL maintainer "Kevin Thon <[email protected]>"
+LABEL maintainer="Kevin Thon <[email protected]>"
 
 ARG GITHUB_PAT
 ENV GITHUB_PAT=${GITHUB_PAT}

dev/Dockerfile

@@ -1,8 +1,8 @@
 FROM rocker/verse:4.4.1
 
-LABEL maintainer "Arnfinn Hykkerud Steindal <[email protected]>"
+LABEL maintainer="Arnfinn Hykkerud Steindal <[email protected]>"
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # system libraries of general use
 # hadolint ignore=DL3008
@@ -33,7 +33,7 @@ RUN locale-gen nb_NO.UTF-8
 # System locales
 ENV LANG=nb_NO.UTF-8
 ENV LC_ALL=nb_NO.UTF-8
-ENV LC_TIME nb_NO.UTF-8
+ENV LC_TIME=nb_NO.UTF-8
 RUN echo "LANG=\"nb_NO.UTF-8\"" > /etc/default/locale
 ENV TZ=Europe/Oslo
 
@@ -94,7 +94,7 @@ RUN touch /home/rstudio/.Renviron \
     && echo "DB_HOST=${DB_HOST}" >> /home/shiny/.Renviron \
     && echo "DB_USER=${DB_USER}" >> /home/shiny/.Renviron \
     && echo "DB_PASS=${DB_PASS}" >> /home/shiny/.Renviron \
-    && R -e "install.packages(c('remotes', 'lifecycle', 'testthat'), repos='https://cloud.r-project.org/')" \
+    && R -e "install.packages(c('remotes', 'lifecycle', 'testthat', 'lintr'), repos='https://cloud.r-project.org/')" \
     && R -e "remotes::install_github('rapporteket/rapbase@*release')" \
     && R -e "file.copy(system.file(c('dbConfig.yml', 'rapbaseConfig.yml', 'autoReport.yml'), package = 'rapbase'), Sys.getenv('R_RAP_CONFIG_PATH'))" \
     && touch ${CONFIG_PATH}/appLog.csv \

ethirgast-dev/Dockerfile

@@ -0,0 +1,13 @@
+FROM rapporteket/dev:weekly
+
+LABEL maintainer="Kevin Thon <[email protected]>"
+
+ARG GITHUB_PAT
+ENV GITHUB_PAT=${GITHUB_PAT}
+
+# add registry dev config and R pkg dependencies
+COPY --chown=rstudio:rstudio db.yml /home/rstudio/rap_config/
+RUN cat /home/rstudio/rap_config/db.yml >> /home/rstudio/rap_config/dbConfig.yml \
+    && rm /home/rstudio/rap_config/db.yml \
+    && R -e "remotes::install_github(c('Rapporteket/rapbase', 'Rapporteket/rapFigurer', \
+    'Rapporteket/ethirgast'))"

ethirgast-dev/db.yml

@@ -0,0 +1,9 @@
+
+# for registry development
+ethirgast:
+  host: db
+  name: Ethirgast
+  user: root
+  pass: root
+  disp: ForEthirgastDevOnly
+

intensivberedskap-dev/Dockerfile

@@ -0,0 +1,13 @@
+FROM rapporteket/dev:weekly
+
+LABEL maintainer="Kevin Thon <[email protected]>"
+
+ARG GITHUB_PAT
+ENV GITHUB_PAT=${GITHUB_PAT}
+
+# add registry dev config and R pkg dependencies
+COPY --chown=rstudio:rstudio db.yml /home/rstudio/rap_config/
+RUN cat /home/rstudio/rap_config/db.yml >> /home/rstudio/rap_config/dbConfig.yml \
+    && rm /home/rstudio/rap_config/db.yml \
+    && R -e "remotes::install_github(c('Rapporteket/rapbase', 'Rapporteket/rapFigurer', \
+    'Rapporteket/intensivberedskap', 'Rapporteket/intensiv'))"

intensivberedskap-dev/db.yml

@@ -0,0 +1,9 @@
+
+# for registry development
+nir:
+  host: db
+  name: intensivregisterreportdatastaging
+  user: root
+  pass: root
+  disp: ForNIRDevOnly
+

kvarus-dev/Dockerfile

@@ -0,0 +1,8 @@
+FROM rapporteket/dev:weekly
+
+LABEL maintainer="Stein-Kato <[email protected]>"
+
+ARG GITHUB_PAT
+ENV GITHUB_PAT=${GITHUB_PAT}
+
+RUN R -e "remotes::install_github(c('Rapporteket/kvarus'))"

nnrr-dev/Dockerfile

@@ -1,6 +1,6 @@
 FROM rapporteket/dev:weekly
 
-LABEL maintainer = "Kevin Thon <[email protected]>"
+LABEL maintainer="Kevin Thon <[email protected]>"
 
 ARG GITHUB_PAT
 ENV GITHUB_PAT=${GITHUB_PAT}

norvas-dev/Dockerfile

@@ -0,0 +1,13 @@
+FROM rapporteket/dev:weekly
+
+LABEL maintainer="Kevin Thon <[email protected]>"
+
+ARG GITHUB_PAT
+ENV GITHUB_PAT=${GITHUB_PAT}
+
+# add registry dev config and R pkg dependencies
+COPY --chown=rstudio:rstudio db.yml /home/rstudio/rap_config/
+RUN cat /home/rstudio/rap_config/db.yml >> /home/rstudio/rap_config/dbConfig.yml \
+    && rm /home/rstudio/rap_config/db.yml \
+    && R -e "remotes::install_github(c('Rapporteket/rapbase', 'Rapporteket/rapFigurer', \
+    'Rapporteket/norvas'))"

norvas-dev/db.yml

@@ -0,0 +1,9 @@
+
+# for registry development
+norvas:
+  host: db
+  name: NorvasReportDataStaging
+  user: root
+  pass: root
+  disp: ForNorvasDevOnly
+

nra-dev/Dockerfile

@@ -1,6 +1,6 @@
 FROM rapporteket/dev:weekly
 
-LABEL maintainer = "Kevin Thon <[email protected]>"
+LABEL maintainer="Kevin Thon <[email protected]>"
 
 ARG GITHUB_PAT
 ENV GITHUB_PAT=${GITHUB_PAT}

renovate.json

@@ -2,6 +2,6 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "commitMessageExtra": "from v{{currentVersion}} to {{prettyNewVersion}}",
   "extends": [
-    "config:base"
+    "config:recommended"
   ]
 }

rstudio/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocker/verse:4.4.1
 
-LABEL maintainer "Arnfinn Hykkerud Steindal <[email protected]>"
+LABEL maintainer="Arnfinn Hykkerud Steindal <[email protected]>"
 
 RUN echo "www-frame-origin=same" >> /etc/rstudio/disable_auth_rserver.conf \
   && echo "www-verify-user-agent=0" >> /etc/rstudio/disable_auth_rserver.conf

rygg-dev/Dockerfile

@@ -0,0 +1,13 @@
+FROM rapporteket/dev:weekly
+
+LABEL maintainer="Kevin Thon <[email protected]>"
+
+ARG GITHUB_PAT
+ENV GITHUB_PAT=${GITHUB_PAT}
+
+# add registry dev config and R pkg dependencies
+COPY --chown=rstudio:rstudio db.yml /home/rstudio/rap_config/
+RUN cat /home/rstudio/rap_config/db.yml >> /home/rstudio/rap_config/dbConfig.yml \
+    && rm /home/rstudio/rap_config/db.yml \
+    && R -e "remotes::install_github(c('Rapporteket/rapbase', 'Rapporteket/rapFigurer', \
+    'Rapporteket/rygg'))"

rygg-dev/db.yml

@@ -0,0 +1,9 @@
+
+# for registry development
+rygg:
+  host: db
+  name: NKRRapporteket
+  user: root
+  pass: root
+  disp: ForRyggDevOnly
+