Skip to content

Commit

Permalink
wip: Prepare dev dockerfile for stow refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
jhwohlgemuth committed Nov 27, 2024
1 parent 64d92fa commit 641fec5
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 9 deletions.
3 changes: 1 addition & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ ENV GRADIO_SERVER_NAME="0.0.0.0"
#
# %files
#
ADD --chmod=0755 ./provision/dev/* /tmp/scripts/
ADD --chmod=0755 ./provision/scripts/dev/* /tmp/scripts/
ADD --chmod=0755 ./provision/functions/* /usr/local/bin
ADD https://github.com/jhwohlgemuth/my-shell-setup.git "${DOTFILES}"
Expand Down Expand Up @@ -72,8 +73,6 @@ RUN ln -snf "/usr/share/zoneinfo/${TZ}" /etc/localtime && echo "${TZ}" > /etc/ti
&& mv /tmp/scripts/install_musl.sh /usr/local/bin/install_musl \
&& mv /tmp/scripts/install_pinokio.sh /usr/local/bin/install_pinokio \
&& mv /tmp/scripts/install_xr0.sh /usr/local/bin/install_xr0 \
&& mv /tmp/scripts/start_docker.sh /usr/local/bin/start_docker \
&& mv /tmp/scripts/start_pinokio.sh /usr/local/bin/start_pinokio \
&& /usr/bin/pwsh -Command /tmp/scripts/Install-Modules.ps1 \
&& eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" \
&& brew bundle --file /tmp/scripts/Brewfile \
Expand Down
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ check:

.PHONY: build-image
build-image: format
@docker build --no-cache -t ${REGISTRY}/${GITHUB_ACTOR}/${TASK}:$(VERSION) -f ./Dockerfile.${TASK} .
# @docker build --no-cache -t ${REGISTRY}/${GITHUB_ACTOR}/${TASK}:$(VERSION) -f ./Dockerfile.${TASK} .
@docker build --no-cache -t ${REGISTRY}/${GITHUB_ACTOR}/${TASK} -f ./Dockerfile.${TASK} .

.PHONY: gold gold-push
Expand Down Expand Up @@ -76,12 +76,12 @@ IMAGES = \
rust \
web
SCRIPTS = \
./provision/scripts/dev/configure_locale.sh \
./provision/scripts/dev/configure_ohmyzsh.sh \
./provision/dev/configure_locale.sh \
./provision/dev/configure_ohmyzsh.sh \
./provision/dev/install_dependencies.sh \
./provision/scripts/dev/install_apptainer.sh \
./provision/scripts/dev/install_cosmopolitan.sh \
./provision/scripts/dev/install_cuda.sh \
./provision/scripts/dev/install_dependencies.sh \
./provision/scripts/dev/install_docker.sh \
./provision/scripts/dev/install_dotnet.sh \
./provision/scripts/dev/install_homebrew.sh \
Expand All @@ -90,8 +90,6 @@ SCRIPTS = \
./provision/scripts/dev/install_ohmyzsh.sh \
./provision/scripts/dev/install_pinokio.sh \
./provision/scripts/dev/install_xr0.sh \
./provision/scripts/dev/start_docker.sh \
./provision/scripts/dev/start_pinokio.sh \
./provision/scripts/gold/install_aeneas.sh \
./provision/scripts/gold/install_coq.sh \
./provision/scripts/gold/install_creusot.sh \
Expand Down Expand Up @@ -123,7 +121,9 @@ FUNCTIONS = \
./provision/functions/is_installed \
./provision/functions/move_lines \
./provision/functions/remove_empty_lines \
./provision/functions/requires
./provision/functions/requires \
./provision/functions/start_docker \
./provision/functions/start_pinokio \
FILES = \
./config/code-server/service/finish \
./config/code-server/service/run \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions provision/scripts/dev/install_pinokio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
set -e

requires \
curl \
Xvfb
main() {
#
Expand Down

0 comments on commit 641fec5

Please sign in to comment.