From 641fec570bda43221a00a208f60221407c4ec699 Mon Sep 17 00:00:00 2001 From: Jason Wohlgemuth Date: Tue, 26 Nov 2024 20:23:53 -0500 Subject: [PATCH] wip: Prepare dev dockerfile for stow refactor --- Dockerfile.dev | 3 +-- Makefile | 14 +++++++------- provision/{scripts => }/dev/Brewfile | 0 provision/{scripts => }/dev/Install-Modules.ps1 | 0 provision/{scripts => }/dev/configure_locale.sh | 0 provision/{scripts => }/dev/configure_ohmyzsh.sh | 0 .../{scripts => }/dev/install_dependencies.sh | 0 provision/{scripts => }/dev/manifest.nix | 0 .../dev/start_docker.sh => functions/start_docker} | 0 .../start_pinokio.sh => functions/start_pinokio} | 0 provision/scripts/dev/install_pinokio.sh | 1 + 11 files changed, 9 insertions(+), 9 deletions(-) rename provision/{scripts => }/dev/Brewfile (100%) rename provision/{scripts => }/dev/Install-Modules.ps1 (100%) rename provision/{scripts => }/dev/configure_locale.sh (100%) rename provision/{scripts => }/dev/configure_ohmyzsh.sh (100%) rename provision/{scripts => }/dev/install_dependencies.sh (100%) rename provision/{scripts => }/dev/manifest.nix (100%) rename provision/{scripts/dev/start_docker.sh => functions/start_docker} (100%) rename provision/{scripts/dev/start_pinokio.sh => functions/start_pinokio} (100%) diff --git a/Dockerfile.dev b/Dockerfile.dev index 26932f6..bf21038 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -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}" @@ -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 \ diff --git a/Makefile b/Makefile index 949f58b..3ba39e3 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 \ @@ -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 \ @@ -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 \ diff --git a/provision/scripts/dev/Brewfile b/provision/dev/Brewfile similarity index 100% rename from provision/scripts/dev/Brewfile rename to provision/dev/Brewfile diff --git a/provision/scripts/dev/Install-Modules.ps1 b/provision/dev/Install-Modules.ps1 similarity index 100% rename from provision/scripts/dev/Install-Modules.ps1 rename to provision/dev/Install-Modules.ps1 diff --git a/provision/scripts/dev/configure_locale.sh b/provision/dev/configure_locale.sh similarity index 100% rename from provision/scripts/dev/configure_locale.sh rename to provision/dev/configure_locale.sh diff --git a/provision/scripts/dev/configure_ohmyzsh.sh b/provision/dev/configure_ohmyzsh.sh similarity index 100% rename from provision/scripts/dev/configure_ohmyzsh.sh rename to provision/dev/configure_ohmyzsh.sh diff --git a/provision/scripts/dev/install_dependencies.sh b/provision/dev/install_dependencies.sh similarity index 100% rename from provision/scripts/dev/install_dependencies.sh rename to provision/dev/install_dependencies.sh diff --git a/provision/scripts/dev/manifest.nix b/provision/dev/manifest.nix similarity index 100% rename from provision/scripts/dev/manifest.nix rename to provision/dev/manifest.nix diff --git a/provision/scripts/dev/start_docker.sh b/provision/functions/start_docker similarity index 100% rename from provision/scripts/dev/start_docker.sh rename to provision/functions/start_docker diff --git a/provision/scripts/dev/start_pinokio.sh b/provision/functions/start_pinokio similarity index 100% rename from provision/scripts/dev/start_pinokio.sh rename to provision/functions/start_pinokio diff --git a/provision/scripts/dev/install_pinokio.sh b/provision/scripts/dev/install_pinokio.sh index d42f70d..c9c49cb 100644 --- a/provision/scripts/dev/install_pinokio.sh +++ b/provision/scripts/dev/install_pinokio.sh @@ -2,6 +2,7 @@ set -e requires \ + curl \ Xvfb main() { #