Merge pull request 'feat: enable multirelease' (#6) from neoloc/multirelease into master

Reviewed-on: https://git.query.consul/unkin/docker-almalinux-jupyterinstance/pulls/6

.gitea/workflows/build.yaml

@@ -7,17 +7,10 @@ jobs:
   build:
     runs-on: almalinux-8
     container:
-      image: git.query.consul/unkin/almalinux8:latest
+      image: git.query.consul/unkin/almalinux8-runnerdnd:latest
       options: --privileged
 
     steps:
-      - name: Set up environment
-        run: |
-          dnf install -y yum-utils
-          yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
-          dnf module enable -y nodejs:20
-          dnf install -y docker-ce-cli make bash git nodejs
-
       - name: Checkout code
         uses: actions/checkout@v3
 

.gitea/workflows/deploy.yaml

@@ -9,17 +9,10 @@ jobs:
   build:
     runs-on: almalinux-8
     container:
-      image: git.query.consul/unkin/almalinux8:latest
+      image: git.query.consul/unkin/almalinux8-runnerdnd:latest
       options: --privileged
 
     steps:
-      - name: Set up environment
-        run: |
-          dnf install -y yum-utils
-          yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
-          dnf module enable -y nodejs:20
-          dnf install -y docker-ce-cli make bash git nodejs
-
       - name: Checkout code
         uses: actions/checkout@v3
 

Dockerfile

@@ -1,18 +0,0 @@
-# Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8:latest
-
-# Clean and update the repository cache
-RUN dnf clean all && \
-    dnf makecache
-
-# Install nodejs:20 for actions
-RUN dnf module enable -y nodejs:20 && \
-    dnf install -y nodejs
-
-# Install packages
-RUN dnf groupinstall -y 'Development Tools' && \
-    dnf install -y make cmake gcc gcc-c++ rpm rpmdevtools wget
-
-# Cleanup
-RUN dnf clean all && \
-    rm -rf /var/cache/dnf

Makefile

@@ -1,34 +1,48 @@
-# Get the current Git commit hash
+# Variables
 GIT_COMMIT := $(shell git rev-parse --short HEAD)
-
-# Get the current date in YYYYMMDD format
 DATE_TAG := $(shell date +%Y%m%d)
-
-# Set the Docker image name and repository information
-IMAGE_NAME := almalinux8-template
 REGISTRY := git.query.consul
 OWNER := unkin
 
-# Build the Docker image (without tags)
+# List of releases (directories under ./release)
-build:
+RELEASES := $(shell find release -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
-	docker build --network=host -t $(REGISTRY)/$(OWNER)/$(IMAGE_NAME) .
 
-# Tag the Docker image with the Git commit hash, the date, and 'latest'
+# Build all releases
-tag:
+build: $(addprefix build-,$(RELEASES))
-	docker tag $(REGISTRY)/$(OWNER)/$(IMAGE_NAME) $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):$(GIT_COMMIT)
-	docker tag $(REGISTRY)/$(OWNER)/$(IMAGE_NAME) $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):$(DATE_TAG)
-	docker tag $(REGISTRY)/$(OWNER)/$(IMAGE_NAME) $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):latest
 
-# Push the Docker image to a repository with all tags
+# Tag all releases
-push: tag
+tag: $(addprefix tag-,$(RELEASES))
-	echo "template repo, not pushing"
-	#docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):$(GIT_COMMIT)
-	#docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):$(DATE_TAG)
-	#docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):latest
 
-# Clean up dangling Docker images
+# Push all releases
+push: $(addprefix push-,$(RELEASES))
+
+# Clean dangling images
 clean:
 	docker image prune -f
 
+# List all available releases
+list:
+	@echo "Available releases:"
+	@echo $(RELEASES) | tr ' ' '\n'
+
+# Build a specific release
+build-%:
+	$(info Building almalinux$*-jupyterinstance Docker image)
+	docker build --network=host -t $(REGISTRY)/$(OWNER)/almalinux$*-jupyterinstance -f release/$*/Dockerfile release/$*
+
+# Tag a specific release
+tag-%:
+	$(info Tagging almalinux$*-jupyterinstance Docker image)
+	docker tag $(REGISTRY)/$(OWNER)/almalinux$*-jupyterinstance $(REGISTRY)/$(OWNER)/almalinux$*-jupyterinstance:$(GIT_COMMIT)
+	docker tag $(REGISTRY)/$(OWNER)/almalinux$*-jupyterinstance $(REGISTRY)/$(OWNER)/almalinux$*-jupyterinstance:$(DATE_TAG)
+	docker tag $(REGISTRY)/$(OWNER)/almalinux$*-jupyterinstance $(REGISTRY)/$(OWNER)/almalinux$*-jupyterinstance:latest
+
+# Push a specific release
+push-%: tag-%
+	$(info Pushing almalinux$*-jupyterinstance Docker image)
+	docker push $(REGISTRY)/$(OWNER)/almalinux$*-jupyterinstance:$(GIT_COMMIT)
+	docker push $(REGISTRY)/$(OWNER)/almalinux$*-jupyterinstance:$(DATE_TAG)
+	docker push $(REGISTRY)/$(OWNER)/almalinux$*-jupyterinstance:latest
+
 # Default target
 default: build

README.md

@@ -1,4 +1,4 @@
-# Docker Image Build: Almalinux Template
+# Docker Image Build: Almalinux Jupyterinstance
 
 This project provides a reproducible Docker image build process for `almalinux:8.10`, with custom YUM repository configurations and package installations. The build is automated using a `Makefile` and managed via CI tasks to ensure consistent and reliable Docker image builds.
 
@@ -16,7 +16,7 @@ To build the Docker image without tags:
 make build
 ```
 
-This will use the `docker build` command with `--network=host` to build the image with the name `git.query.consul/unkin/almalinux8-template`.
+This will use the `docker build` command with `--network=host` to build the image with the name `git.query.consul/unkin/almalinux8-jupyterinstance.
 
 ### Tag the Docker Image
 
@@ -27,9 +27,9 @@ make tag
 ```
 
 This will add three tags to the image:
-- `git.query.consul/unkin/almalinux8-template:<GIT_COMMIT>`
+- `git.query.consul/unkin/almalinux8-jupyterinstance:<GIT_COMMIT>`
-- `git.query.consul/unkin/almalinux8-template:<DATE_TAG>`
+- `git.query.consul/unkin/almalinux8-jupyterinstance:<DATE_TAG>`
-- `git.query.consul/unkin/almalinux8-template:latest`
+- `git.query.consul/unkin/almalinux8-jupyterinstance:latest`
 
 ### Push the Docker Image
 
@@ -67,8 +67,8 @@ To test or develop with this `Makefile`, follow these steps:
 
 1. **Clone the repository** and navigate to the project directory:
    ```bash
-   git clone https://git.query.consul/unkin/docker-template.git
+   git clone https://git.query.consul/unkin/docker-almalinux-jupyterinstance.git
-   cd docker-template
+   cd docker-almalinux-jupyterinstance
    ```
 
 2. **Build the Docker image** using the `build` target:

release/8/Dockerfile

@@ -0,0 +1,43 @@
+# Start with the AlmaLinux 8.10 base image
+FROM git.query.consul/unkin/almalinux8:latest
+
+# Clean and update the repository cache
+RUN dnf clean all && \
+    dnf makecache
+
+# Install packages
+RUN dnf install -y python3.12 python3.12-pip
+
+# Cleanup
+RUN dnf clean all && \
+    rm -rf /var/cache/dnf
+
+# create venv for jupyter
+RUN python3.12 -m venv /opt/jupyter
+
+# upgrade pip
+RUN /opt/jupyter/bin/python -m pip install --upgrade pip
+
+# install requirements for jupyterhub-singleinstance
+RUN /opt/jupyter/bin/pip install \
+  'jupyterhub==5.2.1' \
+  'notebook==7.2.2'
+
+# install additional python modules
+RUN /opt/jupyter/bin/pip install \
+    numpy \
+    pandas \
+    matplotlib \
+    pyarrow \
+    pyyaml
+
+# create a user, since we don't want to run as root
+RUN useradd -m jupyter
+ENV HOME=/home/jupyter
+RUN mkdir $HOME/work
+RUN chown jupyter:jupyter $HOME/work
+WORKDIR $HOME/work
+USER jupyter
+
+# set the default command
+CMD ["/opt/jupyter/bin/jupyterhub-singleuser"]

release/9/Dockerfile

@@ -0,0 +1,43 @@
+# Start with the AlmaLinux 8.10 base image
+FROM git.query.consul/unkin/almalinux9:latest
+
+# Clean and update the repository cache
+RUN dnf clean all && \
+    dnf makecache
+
+# Install packages
+RUN dnf install -y python3.12 python3.12-pip
+
+# Cleanup
+RUN dnf clean all && \
+    rm -rf /var/cache/dnf
+
+# create venv for jupyter
+RUN python3.12 -m venv /opt/jupyter
+
+# upgrade pip
+RUN /opt/jupyter/bin/python -m pip install --upgrade pip
+
+# install requirements for jupyterhub-singleinstance
+RUN /opt/jupyter/bin/pip install \
+  'jupyterhub==5.2.1' \
+  'notebook==7.2.2'
+
+# install additional python modules
+RUN /opt/jupyter/bin/pip install \
+    numpy \
+    pandas \
+    matplotlib \
+    pyarrow \
+    pyyaml
+
+# create a user, since we don't want to run as root
+RUN useradd -m jupyter
+ENV HOME=/home/jupyter
+RUN mkdir $HOME/work
+RUN chown jupyter:jupyter $HOME/work
+WORKDIR $HOME/work
+USER jupyter
+
+# set the default command
+CMD ["/opt/jupyter/bin/jupyterhub-singleuser"]