Update and fix docker ci build

creichert · Apr 28, 2023 · 9ae61f2 · 9ae61f2
1 parent 7e7b6da
commit 9ae61f2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,9 +15,6 @@ jobs:
 
       - run: apt install stow emacs -y --no-install-recommends
 
-      # avoid stow tree-folding the whole dir
-      - run: mkdir -p ~/.stack/{programs,snapshots}
-
       # remove pre-existing dotfiles (stow will not)
       - run: rm ~/.profile ~/.bashrc ~/.gitconfig
 

diff --git a/.circleci/images/Dockerfile b/.circleci/images/Dockerfile
@@ -37,13 +37,12 @@ ENV LC_ALL en_US.UTF-8
 RUN apt-get install -y --no-install-recommends \
         systemd \
         systemd-container \
-        systemd-networkd \
         systemd-sysv
 
 # I use curl & libcurl-dev extensively
 RUN apt-get install -y --no-install-recommends \
             openssl                            \
-            libssl1.1                          \
+            libssl3                            \
             ca-certificates                    \
             curl
 
@@ -138,7 +137,7 @@ RUN apt-get -y build-dep emacs
 #
 # - https://gist.github.com/remarkablemark/aacf14c29b3f01d6900d13137b21db3a#file-dockerfile
 ENV NVM_DIR /usr/local/nvm
-ARG node_version=9.7.1
+ARG node_version=10.19.0
 ENV NODE_VERSION ${node_version}
 ENV NVM_INSTALL_URL https://raw.githubusercontent.com/creationix/nvm/v0.31.2/install.sh
 RUN curl --silent -o- $NVM_INSTALL_URL | bash
@@ -155,11 +154,11 @@ ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
 ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
 
 # Install stack
-ENV STACK_INSTALL_URL https://github.com/commercialhaskell/stack/releases/download/v1.9.1/stack-1.9.1-linux-x86_64.tar.gz
+ENV STACK_INSTALL_URL https://github.com/commercialhaskell/stack/releases/download/v2.9.3/stack-2.9.3-linux-x86_64.tar.gz
 RUN curl -L $STACK_INSTALL_URL -o /tmp/stack.tar.gz
 RUN tar -xvzf /tmp/stack.tar.gz
-RUN cp stack-1.9.1-linux-x86_64/stack /usr/local/bin/stack
-RUN rm -rf stack-1.9.1-linux-x86_64 /tmp/stack.tar.gz
+RUN cp stack-2.9.3-linux-x86_64/stack /usr/local/bin/stack
+RUN rm -rf stack-2.9.3-linux-x86_64 /tmp/stack.tar.gz
 
 
 # Print software versions
@@ -173,5 +172,5 @@ CMD bash
 
 # Local Variables:
 # dockerfile-image-name: "creichert/debian"
-# dockerfile-build-args: ("debian_mirror_url=http://192.168.1.189:3142/debian.cse.msu.edu/debian" "node_version=9.7.1")
+# dockerfile-build-args: ("debian_mirror_url=http://debian.cse.msu.edu/debian" "node_version=9.7.1")
 # End:
diff --git a/.gitmodules b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/creichert/base16-xresources
 [submodule "emacs/.emacs.d/ido-vertical-mode.el"]
 	path = emacs/.emacs.d/site-lisp/ido-vertical-mode.el
-	url = https://github.com/creichert/ido-vertical-mode.el
+	url = git@github.com:creichert/ido-vertical-mode.el
 [submodule "x11/.config/cvim"]
 	path = x11/.config/cvim
 	url = https://gist.github.com/creichert/31914a6dc517b22f4a21777c463ab4ff

diff --git a/Makefile b/Makefile
@@ -50,7 +50,7 @@ simulate: submodules
 
 .PHONY: dotfiles
 dotfiles: submodules
-	@stow $(STOW_FLAGS) -v1 --target=$(PKG_DIR) $(PACKAGES)
+	@stow $(STOW_FLAGS) --no-folding -v1 --target=$(PKG_DIR) $(PACKAGES)
 	-@[ -d "./dotlocal" ] && make -C dotlocal/ dotfiles
 
 .PHONY: clean
@@ -151,3 +151,10 @@ bin/bin/xflux:
 	tar xvzf xflux64.tgz
 	mv xflux bin/bin/xflux
 	rm xflux64.tgz
+
+dockerfile:
+	cd .circleci/images && \
+	docker build -t creichert/debian \
+		--build-arg debian_mirror_url="http://httpredir.debian.org/debian" \
+		.
+	docker push creichert/debian