Skip to content

Commit

Permalink
Move Dockerfile up
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhollas committed Jul 18, 2024
1 parent 7a94894 commit dac6a81
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-test-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ jobs:
python-version: 3.11

- name: Install Dev Dependencies 📦
run: pip install -r docker/requirements-dev.txt
run: pip install -r requirements-docker.txt
11 changes: 3 additions & 8 deletions docker/Dockerfile → Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/astral-sh/uv:0.2.18 as uv
FROM base-image
FROM ghcr.io/aiidalab/full-stack:2024.1019

# Copy whole repo and pre-install the dependencies and app to the tmp folder.
# In the before notebook scripts the app will be re-installed by moving it to the app folder.
ENV PREINSTALL_APP_FOLDER ${CONDA_DIR}/aiidalab-qe
COPY --chown=${NB_UID}:${NB_GID} --from=src . ${PREINSTALL_APP_FOLDER}
COPY --chown=${NB_UID}:${NB_GID} . ${PREINSTALL_APP_FOLDER}

USER ${NB_USER}

Expand All @@ -31,12 +31,7 @@ RUN --mount=from=uv,source=/uv,target=/bin/uv \
fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}"

# The app version is used for installing the app when first time the container is started.
ARG APP_VERSION
ENV APP_VERSION ${APP_VERSION}

ARG QE_VERSION
ENV QE_VERSION ${QE_VERSION}
ENV QE_VERSION="7.2"
RUN mamba create -p /opt/conda/envs/quantum-espresso --yes \
qe=${QE_VERSION} \
&& mamba clean --all -f -y && \
Expand Down
File renamed without changes.
10 changes: 0 additions & 10 deletions docker/build.json

This file was deleted.

27 changes: 0 additions & 27 deletions docker/docker-bake.hcl

This file was deleted.

File renamed without changes.

0 comments on commit dac6a81

Please sign in to comment.