Skip to content

Commit aa70b50

Browse files
author
Dominik Falkner
committed
Merge branch 'dfalkner/fix-devcontainer-build' into 'main'
Update 2 files See merge request common/python-package-template!10
2 parents e91ecd7 + 80930f5 commit aa70b50

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎{{ cookiecutter.__package_name_kebab_case }}/.devcontainer/docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
# load environment variables from a dotenv file
44
# env_file: ".env"
55
build:
6-
context: ../..
6+
context: ..
77
dockerfile: Dockerfile
88
# build to stage 'dev'
99
target: dev
@@ -13,8 +13,8 @@ services:
1313
volumes:
1414
# Mounts the project folder to '/workspace'. While this file is in .devcontainer,
1515
# mounts are relative to the first file in the list, which is a level up.
16-
- ../../:/workspace:cached
16+
- ../:/workspace:cached
1717
# Uncomment to run the container with GPU support
1818
# runtime: nvidia
1919
environment:
20-
- NVIDIA_VISIBLE_DEVICES=all
20+
- NVIDIA_VISIBLE_DEVICES=all

‎{{ cookiecutter.__package_name_kebab_case }}/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG FROM_IMAGE=debian:stable-slim
33
FROM $FROM_IMAGE AS build
44

55
ARG PYTHON_VERSION={{cookiecutter.python_version}}
6-
ARG POETRY_VERSION=1.8.0
6+
ARG POETRY_VERSION=1.8.3
77
ENV DEBIAN_FRONTEND=noninteractive
88

99
LABEL maintainer="{{cookiecutter.author_name}} <{{cookiecutter.author_email}}>"
@@ -81,4 +81,6 @@ RUN apt-get update --allow-insecure-repositories && apt-get install -yq \
8181
coreutils \
8282
# editor
8383
vim \
84-
&& rm -rf /var/lib/apt/lists/*
84+
&& rm -rf /var/lib/apt/lists/*
85+
86+
ENTRYPOINT ["tail", "-f", "/dev/null"]

0 commit comments

Comments
 (0)