Skip to content

Commit

Permalink
Using Rocker as base image
Browse files Browse the repository at this point in the history
  • Loading branch information
dmenne committed Aug 14, 2024
1 parent 2edd6bf commit 487821c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Dockerfile_anomanor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM r-base
FROM rocker/r-ver:latest

LABEL maintainer="[email protected]"

Expand Down
6 changes: 3 additions & 3 deletions application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ proxy:
title: Anomanor Shinyproxy
logo-url: https://menne-biomed.de/images/mennebiomed48.gif
container-log-path: ./shinyproxy-logs
container-wait-time: 10000
container-wait-time: 20000
port: 8080
heartbeat-timeout: 60000
heartbeat-timeout: 30000
authentication: openid # tested ok with 'simple'
admin-groups: admins
landing-page: /app_direct/anomanor
Expand Down Expand Up @@ -51,7 +51,7 @@ proxy:
]
container-image: anomanor
container-network: anomanor-net
seats-per-container: 2
#seats-per-container: 2
minimum-seats-available: 2


Expand Down
11 changes: 7 additions & 4 deletions build_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
# Use it whenever you see a <^M> or <<$'\r': command not found>> turn up in error message
# use <<sudo install dos2unix>> to install
#dos2unix ./inst/Renviron_devel
set -euxo pipefail

export R_CONFIG_ACTIVE=sa_admin # or sa_expert, sa_trainee
set -o allexport;
source ./inst/Renviron_devel
set +o allexport

export DOCKER_ANOMANOR_STANDALONE=TRUE
echo "Active configuration: $R_CONFIG_ACTIVE DOCKER_ANOMANOR_STANDALONE=$DOCKER_ANOMANOR_STANDALONE"
TAG="1.0.2"
TAG="1.2.5"

docker rm -f anomanor
docker rm -f anomanor 2> /dev/null
# To force rebuild
#docker rmi -f anomanor
docker system prune -f
Expand All @@ -31,7 +33,8 @@ docker build -f Dockerfile_anomanor \
--build-arg DOCKER_ANOMANOR_STANDALONE \
.

docker push dmenne/anomanor:${TAG}
# Push to github
# docker push dmenne/anomanor:${TAG}


# When run under Windows/wsl2, volumes can be found here:
Expand All @@ -53,4 +56,4 @@ docker ps -l
sleep 3s
docker logs anomanor

echo "Connect with your browser at localhost:3838"
echo Connect with your browser at localhost:3838
4 changes: 4 additions & 0 deletions run_anomanor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
# The following line can be commented out when there is no Windows-LF risk
# Use it whenever you see a <^M> turn up in error message
#dos2unix ./inst/Renviron_devel

# https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
set -euxo pipefail

set -o allexport;
source ./.Renviron
source ./inst/Renviron_devel
Expand Down

0 comments on commit 487821c

Please sign in to comment.