Skip to content

Commit

Permalink
wip: Prepare web dockerfile for stow refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
jhwohlgemuth committed Nov 28, 2024
1 parent 72540c3 commit 0cb988f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
5 changes: 3 additions & 2 deletions Dockerfile.notebook
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ COPY ./config/jupyter/overrides.json "${JUPYTER_LAB_ROOT}/settings/"
COPY ./config/jupyter/environment.yml /tmp/
COPY ./config/code-server/config.yaml /app/code-server/config/
COPY ./config/code-server/settings.json /app/code-server/config/data/Machine/
COPY --chmod=0755 ./config/jupyter/service/* /etc/services.d/jupyter/
COPY --chmod=0755 ./config/code-server/service/* /etc/services.d/code-server/
COPY --chmod=0755 ./provision/notebook/* /tmp/scripts/
COPY --chmod=0755 ./provision/scripts/notebook/* /tmp/scripts/
COPY --chmod=0755 ./config/jupyter/service/* /etc/services.d/jupyter/
COPY --chmod=0755 ./config/code-server/service/* /etc/services.d/code-server/
#
# %post
#
Expand All @@ -71,6 +71,7 @@ RUN openssl req -new -x509 -days 365 -out "${CERTS_DIR}/my.pem" -config "${CERTS
#
# %runscript
#
USER nonroot
WORKDIR /root/dev
SHELL ["/bin/bash", "-c"]
HEALTHCHECK --interval=5m --timeout=30s --start-period=10s --retries=3 \
Expand Down
12 changes: 3 additions & 9 deletions Dockerfile.web
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,15 @@ ENV PATH="${PATH}:${HOME}/.npm-packages/bin"
#
# %setup
#
RUN mkdir -p \
/tmp/scripts/ \
/etc/nixos/ \
/verdaccio/conf/ \
/etc/services.d/verdaccio/ \
/verdaccio/conf \
/verdaccio/plugins \
/verdaccio/storage
# Only supported by Apptainer
# Run setup commands outside of the container (on the host system) after the base image bootstrap.
#
# %files
#
COPY ./provision/web/* /tmp/scripts/
COPY ./config/verdaccio/.npmrc "${HOME}/.npmrc"
COPY ./config/verdaccio/config.yml /verdaccio/conf/
COPY ./config/verdaccio/service/* /etc/services.d/verdaccio/
COPY ./provision/scripts/web/manifest.nix /tmp/scripts/
#
# %post
#
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,16 @@ IMAGES = \
rust \
web
SCRIPTS = \
./provision/dev/Brewfile \
./provision/dev/configure_locale.sh \
./provision/dev/configure_ohmyzsh.sh \
./provision/dev/install_dependencies.sh \
./provision/dev/manifest.nix \
./provision/notebook/install_code_server.sh \
./provision/notebook/install_conda.sh \
./provision/notebook/install_dependencies.sh \
./provision/rust/install_dependencies.sh \
./provision/web/manifest.nix \
./provision/scripts/dev/install_apptainer.sh \
./provision/scripts/dev/install_cosmopolitan.sh \
./provision/scripts/dev/install_cuda.sh \
Expand Down
File renamed without changes.

0 comments on commit 0cb988f

Please sign in to comment.