Skip to content

Commit

Permalink
Update line ending attribute
Browse files Browse the repository at this point in the history
Introduce end-of-line normalization

fix line endings

fix line endings... again... i have no idea what im doing

fix line endings
  • Loading branch information
tjdcs committed Feb 17, 2024
1 parent 8ec11dd commit 3b2e5e9
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 42 deletions.
49 changes: 23 additions & 26 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
{
"build": {
"dockerfile": "dockerfile"
},
"features": {
"ghcr.io/devcontainers/features/git:1": {},
},
"postCreateCommand": "zsh /workspaces/DevContainer/.devcontainer/scripts/post-create.zsh",
"postStartCommand": "zsh /workspaces/DevContainer/.devcontainer/scripts/post-start.zsh",
"customizations": {
"vscode": {
"extensions": [
"ms-python.python",
"streetsidesoftware.code-spell-checker",
"charliermarsh.ruff",
"njpwerner.autodocstring",
"tamasfe.even-better-toml",
"ms-python.black-formatter",
"ms-python.isort",
"ms-toolsai.jupyter",
"ms-azuretools.vscode-docker",
"ms-vscode-remote.remote-containers",
"p403n1x87.austin-vscode"
]
}
}
{
"build": {
"dockerfile": "dockerfile"
},
"customizations": {
"vscode": {
"extensions": [
"ms-python.python",
"streetsidesoftware.code-spell-checker",
"charliermarsh.ruff",
"njpwerner.autodocstring",
"tamasfe.even-better-toml",
"ms-python.black-formatter",
"ms-python.isort",
"ms-toolsai.jupyter",
"ms-azuretools.vscode-docker",
"ms-vscode-remote.remote-containers",
"p403n1x87.austin-vscode"
]
}
},
"postCreateCommand": "zsh /workspaces/DevContainer/.devcontainer/scripts/post-create.zsh",
"postStartCommand": "zsh /workspaces/DevContainer/.devcontainer/scripts/post-start.zsh"
}
32 changes: 16 additions & 16 deletions .devcontainer/dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM mcr.microsoft.com/devcontainers/python:3.12
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y --no-install-recommends \
git git-lfs austin graphviz graphviz-dev libboost-all-dev libilmbase-dev \
libopenexr-dev libpng-dev libtiff5-dev
RUN apt-get autoremove -y && \
apt-get clean -y && \
DEBIAN_FRONTEND=
USER vscode
RUN pipx install poetry
FROM mcr.microsoft.com/devcontainers/python:3.12

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install -y --no-install-recommends \
git git-lfs austin graphviz graphviz-dev libboost-all-dev libilmbase-dev \
libopenexr-dev libpng-dev libtiff5-dev

RUN apt-get autoremove -y && \
apt-get clean -y && \
DEBIAN_FRONTEND=

USER vscode
RUN pipx install poetry

5 changes: 5 additions & 0 deletions .devcontainer/scripts/post-create.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ cd /workspaces/DevContainer
# https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/
# https://github.com/microsoft/vscode-remote-release/issues/7923
git config --global --add safe.directory /workspaces/DevContainer
git config --global --add safe.directory /workspaces/DevContainer/colour-science
git config --global --add safe.directory /workspaces/DevContainer/colour-datasets
git config --global --add safe.directory /workspaces/DevContainer/colour-specio

git submodule update --init

poetry env use 3.12
poetry install
poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text eol=lf

0 comments on commit 3b2e5e9

Please sign in to comment.