norgast nhnutvikling

Rapporteket · Oct 29, 2024 · 4843088 · 4843088
1 parent 02c143a
commit 4843088
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
         - main
+        - nhn
   pull_request:
     branches:
         - main

diff --git a/norgast-dev/Dockerfile b/norgast-dev/Dockerfile
@@ -1,13 +1,11 @@
 FROM rapporteket/dev:weekly
 
-LABEL maintainer "Kevin Thon <[email protected]>"
+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/norgast'))"
+
+RUN R -e "remotes::install_github(c('Rapporteket/norgast@nhn', 'Rapporteket/rapFigurer', \
+    'Rapporteket/rapbase@main'))"
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ on: @@
       push:
         branches:
             - main
+            - nhn
       pull_request:
         branches:
             - main
@@ Expand Down @@