Skip to content

Commit 1f491cd

Browse files
committed
ci: Modified dev container; added container for 'externals'
1 parent 4e1aa71 commit 1f491cd

File tree

4 files changed

+24
-6
lines changed

4 files changed

+24
-6
lines changed

.devcontainer/Dockerfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
FROM ghcr.io/prefix-dev/pixi:latest AS pixi-base
2-
# This image overlay was the best way I found to run (linux) .Net applications within
3-
# a miniforge container.
1+
# To build this docker (from the root checkout) run:
2+
# `docker build -t vrtool_externals_dev .devcontainer`
3+
# To run the docker for pytest:
4+
# `docker run -v {your_vrtool_checkout_dir}:/usr/src/app/ -v {vrtool_env_dir}:/usr/src/.env -t vrtool_externals_dev`
5+
# `pixi install -e dev`
6+
# `pixi run -e dev pytest -m {your_pytest_arguments}`
47

8+
FROM containers.deltares.nl/gfs-dev/vrtool_utils_externals:latest AS vrtool_utils_externals-env
9+
FROM ghcr.io/prefix-dev/pixi:latest AS pixi-base
10+
# Use the pixi base image
511
ARG SRC_ROOT="/usr/src"
612
# Set PIXI_HOME to a location inside the source root
713
ENV PIXI_HOME=$SRC_ROOT/.pixi
@@ -10,9 +16,7 @@ ENV PIXI_HOME=$SRC_ROOT/.pixi
1016
# -v {your_vrtool_checkout_dir}:/usr/src/app
1117
WORKDIR $SRC_ROOT/app
1218

13-
# This apparently is necessary for matplotlib to work properly
14-
RUN apt-get update
15-
RUN apt-get install -y tcl tk
19+
COPY --from=vrtool_utils_externals-env $SRC_ROOT/test_externals ${SRC_EXTERNALS}
1620

1721
# Define the endpoint
1822
CMD [ "/bin/bash" ]

.devcontainer/externals.Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# To build this docker (from the root checkout) run:
2+
# `docker build -t vrtool_utils_externals -f .devcontainer/externals.Dockerfile`
3+
4+
FROM ubuntu:latest
5+
6+
ARG SRC_ROOT="/usr/src"
7+
8+
WORKDIR $SRC_ROOT/app
9+
COPY externals $SRC_ROOT/test_externals
10+
RUN chmod a+x "${SRC_ROOT}/test_externals/HydraRing-23.1.1"
11+
12+
13+
# Define the endpoint
14+
CMD [ "/bin/bash" ]
-243 KB
Binary file not shown.
-139 KB
Binary file not shown.

0 commit comments

Comments
 (0)