Skip to content

Commit

Permalink
Merge pull request #31 from BerriJ/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
BerriJ authored Oct 5, 2023
2 parents fd7d282 + d0c9440 commit 012e690
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 20 deletions.
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"ms-python.python",
"ms-python.black-formatter",
"visualstudioexptteam.vscodeintellicode",
"ms-toolsai.jupyter",
// R
"REditorSupport.r",
"rdebugger.r-debugger",
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_deploy_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
install: true
-
name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand All @@ -36,7 +36,7 @@ jobs:
echo "IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
-
name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_deploy_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
install: true
-
name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand All @@ -36,7 +36,7 @@ jobs:
echo "IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
-
name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_deploy_size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
install: true
-
name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand All @@ -35,7 +35,7 @@ jobs:
echo "IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
-
name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_on_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
install: true
-
name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand All @@ -34,7 +34,7 @@ jobs:
echo "IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
-
name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:jammy@sha256:ec050c32e4a6085b423d36ecd025c0d3ff00c38ab93a3d71a460ff1c44fa6d77
FROM ubuntu:jammy@sha256:aabed3296a3d45cede1dc866a24476c4d7e093aa806263c27ddaadbdce3c1054

SHELL ["/bin/bash", "-c"]

Expand Down Expand Up @@ -39,6 +39,7 @@ RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula sele
zsh \
gnupg2 \
nano \
gdb \
ssh-client \
fontconfig \
ttf-mscorefonts-installer \
Expand Down Expand Up @@ -116,8 +117,8 @@ ENV PATH="/usr/local/texlive/bin/x86_64-linux:${PATH}"
ENV R_VERSION=4.3.1

# Set RSPM snapshot see:
# https://packagemanager.rstudio.com/client/#/repos/1/overview
ENV R_REPOS=https://packagemanager.posit.co/cran/__linux__/jammy/2023-08-28
# 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/2023-10-04

COPY install_scripts/install_r.sh /install_scripts/install_r.sh
COPY package_lists/r_packages.txt /package_lists/r_packages.txt
Expand Down
1 change: 1 addition & 0 deletions package_lists/latex_packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ texdoc # Package Documentation
textcase
textpos
threeparttable
threeparttablex
thumbpdf
#! To find packages: tlmgr search --global --file "authblk.sty"
tracklang
Expand Down
1 change: 1 addition & 0 deletions package_lists/python_packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Jinja2
kaleido
matplotlib
meteostat
nbformat
numdifftools
numpy
pandas
Expand Down
1 change: 1 addition & 0 deletions package_lists/r_packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,6 @@ tsrobprep
VineCopula
wiqid
xaringan
xaringanExtra
xtable
zoo
1 change: 0 additions & 1 deletion package_lists/r_packages_github.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
BerriJ/strsplit.fix
gadenbuie/xaringanExtra@*release
GreenGrassBlueOcean/RefinitivR
ManuelHentschel/vscDebugger@*release
stenevang/sftp

0 comments on commit 012e690

Please sign in to comment.