Skip to content

Commit

Permalink
shinyproxy rename
Browse files Browse the repository at this point in the history
  • Loading branch information
jwijffels committed Apr 18, 2024
1 parent 7295ac4 commit 0f3b17a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions shinyproxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@ ARG SHINYPROXY_VERSION=3.0.2
ENV SHINYPROXY_VERSION=$SHINYPROXY_VERSION
ARG SHINYPROXY_INSTALL_DIR=/opt/shinyproxy
ENV SHINYPROXY_INSTALL_DIR=$SHINYPROXY_INSTALL_DIR
ARG SHINYPROXY_APP_DIR=/etc/shinyproxy
ENV SHINYPROXY_APP_DIR=$SHINYPROXY_APP_DIR
ARG SHINYPROXY_APPLICATION_DIR=/etc/shinyproxy
ENV SHINYPROXY_APPLICATION_DIR=$SHINYPROXY_APPLICATION_DIR

## Download ShinyProxy to /opt/shinyproxy
WORKDIR $SHINYPROXY_INSTALL_DIR
RUN wget https://www.shinyproxy.io/downloads/shinyproxy-${SHINYPROXY_VERSION}.jar -O shinyproxy.jar

## Make sure
## Script init-application-yml.sh makes sure application.yml is put from ${SHINYPROXY_APPLICATION_DIR}/application.yml to ${SHINYPROXY_INSTALL_DIR}/application.yml
## Runs shinyproxy from the SHINYPROXY_INSTALL_DIR
COPY ./entrypoint.sh init-application-yml.sh
RUN chmod +x ./init-application-yml.sh & mkdir -p $SHINYPROXY_APP_DIR
VOLUME $SHINYPROXY_APP_DIR
RUN chmod +x ./init-application-yml.sh & mkdir -p $SHINYPROXY_APPLICATION_DIR
VOLUME $SHINYPROXY_APPLICATION_DIR

ENTRYPOINT ["sh", "./init-application-yml.sh"]

Expand Down
2 changes: 1 addition & 1 deletion shinyproxy/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e

echo "Initialising ShinyProxy configuration..."

cd ${SHINYPROXY_APP_DIR}
cd ${SHINYPROXY_APPLICATION_DIR}
echo " - checking ${PWD} for Shinyproxy config file"

# substitute ${ENV_VARIABLE}s with container environment variables
Expand Down

0 comments on commit 0f3b17a

Please sign in to comment.