go go go

Dockerfile

@@ -1,3 +1,4 @@
+ARG GITHUB_PAT
 FROM rocker/r2u:22.04
 
 WORKDIR /workspace
@@ -30,11 +31,12 @@ RUN set -eux; \
         ; \
     rm -rf /var/lib/apt/lists/*;
     
-RUN R -e "install.packages(c('htmltools', 'tidyverse', 'zeallot', 'rlang', 'glue', 'this.path', 'DBI', 'pool', 'RSQLite', 'remotes'))"
+RUN R -e " options(bspm.sudo = TRUE); install.packages(c('htmltools', 'tidyverse', 'zeallot', 'rlang', 'glue', 'this.path', 'DBI', 'pool', 'RSQLite', 'remotes', 'promises', 'assertthat', 'log'))"
 
-RUN R -e "install.packages('b64', repos = c('https://extendr.r-universe.dev', 'https://cloud.r-project.org')); install.packages('uwu', repos = c('https://josiahparry.r-universe.dev', 'https://cloud.r-project.org'))"
+RUN R -e "options(bspm.sudo = TRUE);install.packages('b64', repos = c('https://extendr.r-universe.dev', 'https://cloud.r-project.org')); install.packages('uwu', repos = c('https://josiahparry.r-universe.dev', 'https://cloud.r-project.org'))"
 
-COPY . .
+RUN adduser newuser
+COPY --chown=newuser . .
 
 EXPOSE 7860
-CMD R -e "print(Sys.getenv('GITHUB_PAT')); bspm::disable(); remotes::install_github(c('devOpifex/ambiorix', 'jrosell/ambhtmx',  'devOpifex/scilis', 'devOpifex/signaculum')); bspm::enable(); options(ambiorix.host='0.0.0.0', 'ambiorix.port'=7860);source('app.R')"
+CMD R -e "print(length(Sys.getenv('GITHUB_PAT'))); options(bspm.sudo = TRUE); remotes::install_github(c('devOpifex/ambiorix', 'jrosell/ambhtmx',  'devOpifex/scilis', 'devOpifex/signaculum')); bspm::enable(); options(ambiorix.host='0.0.0.0', 'ambiorix.port'=7860);source('app.R')"

README.md

@@ -10,27 +10,31 @@ pinned: false
 Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
 
 
-# Docker in local
+# Runing the example in Docker
 
-To create the image and run the container in Docker, run:
+First, you can create the image and test the container in Docker:
 
 ```
 docker build -f Dockerfile -t ambhtmx . \
   && docker run --env-file=.Renviron -p 7860:7860 --name ambhtmx-container --rm ambhtmx
 ```
 
-If you need an output folder:
+If you want to rerun the process, you may need to remove the previous containers and images:
+
 ```
-docker build -f Dockerfile -t ambhtmx . \
-  && docker run -env-file=.Renviron -p 7860:7860 --name ambhtmx-container --rm  -v $(pwd)/output:/workspace/output/:rw  ambhtmx
+(docker container rm -f ambhtmx-container || true)\
+  && (docker rmi $(docker images --format '{{.Repository}}:{{.ID}}'| egrep 'ambhtmx' | cut -d':' -f2 | uniq) --force || true) \
+  && docker build -f Dockerfile -t ambhtmx . \
+  && docker run --env-file=.Renviron -p 7860:7860 --name ambhtmx-container --rm ambhtmx
 ```
 
 
-To stop, remove the container and create the image and run another container:
+If you need to read the output files from your host, run:
+
 ```
-docker container rm -f ambhtmx-container \
-  && docker build -f Dockerfile -t ambhtmx . \
-  && docker run --env-file=.Renviron -p 7860:7860 --name ambhtmx-container --rm ambhtmx
+docker build -f Dockerfile -t ambhtmx . \
+  && docker run --env-file=.Renviron -p 7860:7860 --name ambhtmx-container --rm -v $(pwd)/output:/workspace/output/:rw ambhtmx
 ```
 
 
+

app.R

@@ -85,14 +85,19 @@ c(app, context, items) %<-%
 
 #' Authentication feature with secret cookies and .Renviron variables
 app$get("/login", \(req, res) {
-  process_login_get(req, res)
+  process_login_get(
+    req,
+    res,
+    login_url = str_replace(req$HTTP_HOST, "0.0.0.0", "127.0.0.1")
+  )
 })
 app$post("/login", \(req, res) {      
   process_login_post(
     req,
     res,
     user = Sys.getenv("AMBHTMX_USER"),
-    password = Sys.getenv("AMBHTMX_PASSWORD")
+    password = Sys.getenv("AMBHTMX_PASSWORD"),
+    login_url = str_replace(req$HTTP_HOST, "0.0.0.0", "127.0.0.1")
   )
 })
 app$get("/logout", \(req, res) {