Skip to content

Commit

Permalink
Add hatch
Browse files Browse the repository at this point in the history
  • Loading branch information
APN-Pucky committed Sep 18, 2024
1 parent e4ffb9f commit 5eb39e2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
3 changes: 3 additions & 0 deletions ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ RUN python3 -m pip install --no-cache-dir --upgrade nbconvert notebook sphinx-ma
FROM apnpucky/ubuntu-dev as pip
RUN python3 -m pip install --no-cache-dir --upgrade setuptools wheel pytest pytest-cov pytest-profiling sympy scipy numpy tqdm ipython uncertainties pandas build matplotlib sphinx-math-dollar jupyterlab numpydoc sphinx nbsphinx sphinx-rtd-theme ipywidgets jupyter_sphinx sphinx-autoapi sphinxcontrib-napoleon

FROM apnpucky/ubuntu-pip as hatch
RUN python3 -m pip install --no-cache-dir --upgrade hatch hatch-vcs

FROM apnpucky/ubuntu-pip as poetry
RUN python3 -m pip install --no-cache-dir --upgrade poetry poetry-dynamic-versioning

Expand Down
10 changes: 5 additions & 5 deletions ubuntu/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
TAG:="$(shell date +%Y%m%d%H%M%S)"
build:
# We run this twice so that latest is slightly older, but also existent for dependent builds
docker-compose build
TAG=$(TAG) docker-compose build
docker-compose build
docker compose build
TAG=$(TAG) docker compose build
docker compose build
push: build
TAG=$(TAG) docker-compose push
docker-compose push
TAG=$(TAG) docker compose push
docker compose push
8 changes: 7 additions & 1 deletion ubuntu/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ services:
target: poetry
image: apnpucky/ubuntu-poetry:${TAG:-latest}

hatch:
build:
context: .
target: hatch
image: apnpucky/ubuntu-hatch:${TAG:-latest}

python:
build:
context: .
Expand Down Expand Up @@ -73,4 +79,4 @@ services:
build:
context: .
target: python-form
image: apnpucky/ubuntu-latexmk-form:${TAG:-latest}
image: apnpucky/ubuntu-python-form:${TAG:-latest}

0 comments on commit 5eb39e2

Please sign in to comment.