Skip to content

Commit

Permalink
Update path
Browse files Browse the repository at this point in the history
  • Loading branch information
BerriJ committed Sep 24, 2024
1 parent 84788ae commit b0c0a13
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build_deploy_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
branches:
- 'dev'
schedule:
- cron: '35 * * * *'

env:
IMAGE_NAME: devenv
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_deploy_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build and Deploy
on:
push:
branches:
- 'master'
- 'main'

env:
IMAGE_NAME: devenv
Expand Down
20 changes: 10 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,17 @@ RUN apt-get update &&\
ENV PATH="/home/vscode/.local/bin:${PATH}"

# Install Latex
COPY install_scripts/install_latex.sh /install_scripts/install_latex.sh
COPY package_lists/latex_packages.txt /package_lists/latex_packages.txt
COPY install_scripts/install_latex.sh /tmp/install_latex.sh
COPY package_lists/latex_packages.txt /tmp/latex_packages.txt

RUN chmod +x install_scripts/install_latex.sh &&\
install_scripts/install_latex.sh \
RUN chmod +x tmp/install_latex.sh &&\
tmp/install_latex.sh \
&& export PATH="/usr/local/texlive/bin/x86_64-linux:${PATH}" \
&& tlmgr option -- autobackup 0 \
&& tlmgr option -- docfiles 0 \
&& tlmgr option -- srcfiles 0 \
&& tlmgr install \
$(grep -o '^[^#]*' package_lists/latex_packages.txt | tr '\n' ' ') \
$(grep -o '^[^#]*' tmp/latex_packages.txt | tr '\n' ' ') \
&& chown --recursive $USERNAME:$USERNAME /usr/local/texlive

# Set Latex Path
Expand All @@ -148,12 +148,12 @@ ENV R_VERSION=4.4.1
# https://packagemanager.posit.co/client/#/repos/cran/setup?r_environment=other&snapshot=2023-10-04&distribution=ubuntu-22.04
ENV R_REPOS=https://packagemanager.posit.co/cran/__linux__/jammy/2024-09-18

COPY install_scripts/install_r.sh /install_scripts/install_r.sh
COPY package_lists/r_packages.txt /package_lists/r_packages.txt
COPY package_lists/r_packages_github.txt /package_lists/r_packages_github.txt
COPY install_scripts/install_r.sh /tmp/install_r.sh
COPY package_lists/r_packages.txt /tmp/r_packages.txt
COPY package_lists/r_packages_github.txt /tmp/r_packages_github.txt

RUN chmod +x install_scripts/install_r.sh &&\
install_scripts/install_r.sh
RUN chmod +x tmp/install_r.sh &&\
tmp/install_r.sh

COPY --chown=$USERNAME .misc/.zshrc /home/$USERNAME/.

Expand Down
4 changes: 2 additions & 2 deletions install_scripts/install_r.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ pip3 install -U --no-cache-dir radian

# R packages on RSPM
install2.r --error --skipinstalled --ncpus 32 \
$(grep -o '^[^#]*' package_lists/r_packages.txt | tr '\n' ' ')
$(grep -o '^[^#]*' tmp/r_packages.txt | tr '\n' ' ')

# R packages on Github
installGithub.r \
$(grep -o '^[^#]*' package_lists/r_packages_github.txt | tr '\n' ' ')
$(grep -o '^[^#]*' tmp/r_packages_github.txt | tr '\n' ' ')

# Miniconda for Refinitiv and resp. python dependenies
R -e "Refinitiv::install_eikon()"
Expand Down

0 comments on commit b0c0a13

Please sign in to comment.