Skip to content

Commit

Permalink
Merge pull request #236 from massongit/patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
KazuhiroM authored Sep 23, 2023
2 parents 9a34b7e + 25aafc1 commit b97559a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dockle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: |
for image_name in $(docker compose images | awk 'OFS=":" {print $2,$3}' | tail -n +2); do
cmd="docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v $(pwd)/.dockleignore:/.dockleignore "
cmd+="goodwithtech/dockle:${{ steps.get_latest_dockle_version.outputs.result }} --exit-code 1 "
cmd+="goodwithtech/dockle:${{ steps.get_latest_dockle_version.outputs.result }} --exit-code 1 --exit-level info "
if [[ "${image_name}" =~ "dss-notebook" ]]; then
cmd+="--timeout 600s -ae mdf -af settings.py -af credentials -i DKL-DI-0001 "
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends libpq-dev libmariadb-dev \
&& apt-get remove -y lsb-release gnupg \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* /opt/julia-*/share/julia/stdlib/v*/SuiteSparse/.devcontainer/Dockerfile \
&& rm -rf /var/lib/apt/lists/* /opt/julia-*/share/julia/stdlib/v*/SuiteSparse/.devcontainer/Dockerfile /opt/julia/packages/Pluto/kxeso/.vscode/ \
&& find / -type f -perm /u+s -ignore_readdir_race -exec chmod u-s {} \; \
&& find / -type f -perm /g+s -ignore_readdir_race -exec chmod g-s {} \;

Expand All @@ -27,6 +27,6 @@ RUN pip install --no-cache-dir pipenv==2021.5.29 \
&& pipenv install --system \
&& Rscript -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/stable/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))' \
&& Rscript -e 'pak::repo_add(CRAN = "RSPM@2022-12-16"); pak::pak(c("DBI", "RPostgreSQL", "themis"))' \
&& rm -rf Pipfile* /tmp/* /var/tmp/*
&& rm -rf Pipfile* .cache/R/pkgcache/sysreqs/docker/*/Dockerfile /tmp/* /var/tmp/*

HEALTHCHECK --interval=5s --retries=20 CMD ["curl", "-s", "-S", "-o", "/dev/null", "http://localhost:8888"]

0 comments on commit b97559a

Please sign in to comment.