Merge pull request #12 from esgf-nimbus/fixes-pdf-export

Fixes pdf export
esgf-nimbus · Jan 30, 2024 · 48f8b26 · 48f8b26
2 parents 080a3fd + 45e7c8a
commit 48f8b26
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 22 deletions.
diff --git a/dockerfiles/Makefile b/dockerfiles/Makefile
@@ -5,7 +5,8 @@ NAMESPACE ?= ghcr.io/esgf-nimbus
 build push run: REPOSITORY = $(lastword $(subst /, ,$(PWD)))
 
 build: changelog
-	docker build $(ARGS) -t $(NAMESPACE)/$(REPOSITORY):$(VERSION) .
+	docker build $(ARGS) -t $(NAMESPACE)/$(REPOSITORY):$(VERSION) . && \
+		$(POST_BUILD)
 
 push:
 	docker push $(NAMESPACE)/$(REPOSITORY):$(VERSION)
@@ -17,4 +18,4 @@ changelog:
 	git log --pretty="%s [%h](https://github.com/esgf-nimbus/nimbus/commit/%h) (%cs)" . | python -c "import sys;lines=[f'- {x}' if x.startswith('Bump') else f'  - {x}' for x in sys.stdin]; print(''.join(['# Changelog\n'] + lines))" > changelog.md
 
 bump-%:
-	tbump $(if $(COMMIT),,--dry-run) --no-tag --no-push $(shell pysemver bump $* $(shell tbump current-version))
+	tbump $(if $(COMMIT),,--dry-run) --no-tag --no-push $(shell pysemver bump $* $(shell tbump current-version)) $(if $(COMMIT),&& make changelog && git add changelog.md && git commit -m "Updates changelog",)
diff --git a/dockerfiles/dask-gateway/Makefile b/dockerfiles/dask-gateway/Makefile
@@ -1,5 +1,5 @@
 .DEFAULT_GOAL = build
 
-VERSION = 0.1.4
+VERSION = 0.1.5
 
 include ../Makefile
diff --git a/dockerfiles/dask-gateway/changelog.md b/dockerfiles/dask-gateway/changelog.md
@@ -1,4 +1,8 @@
 # Changelog
+- Bump dask-gateway to 0.1.5 [ab73505](https://github.com/esgf-nimbus/nimbus/commit/ab73505) (2024-01-30)
+  - Removes before_commit hook [5e7bcc8](https://github.com/esgf-nimbus/nimbus/commit/5e7bcc8) (2024-01-30)
+- Bump dask-gateway to 0.1.4 [080a3fd](https://github.com/esgf-nimbus/nimbus/commit/080a3fd) (2024-01-22)
+  - Updates changelog [c65bb67](https://github.com/esgf-nimbus/nimbus/commit/c65bb67) (2024-01-22)
   - Fixes hook to update changelog [0b1c626](https://github.com/esgf-nimbus/nimbus/commit/0b1c626) (2024-01-22)
   - Removes push after bump [6ec59dc](https://github.com/esgf-nimbus/nimbus/commit/6ec59dc) (2024-01-22)
   - Adds pcmdi_metrics package [6696776](https://github.com/esgf-nimbus/nimbus/commit/6696776) (2024-01-22)

diff --git a/dockerfiles/dask-gateway/tbump.toml b/dockerfiles/dask-gateway/tbump.toml
@@ -1,5 +1,5 @@
 [version]
-current = "0.1.4"
+current = "0.1.5"
 
 regex = '''
   (?P<major>\d+)
@@ -16,7 +16,3 @@ tag_template = "v{new_version}"
 [[file]]
 src = "Makefile"
 search = "VERSION = {current_version}"
-
-[[before_commit]]
-name = "Update changelog"
-cmd = "make changelog; git add changelog.md; git commit -m 'Updates changelog'"
diff --git a/dockerfiles/minimal-notebook-gpu/Dockerfile b/dockerfiles/minimal-notebook-gpu/Dockerfile
@@ -1,4 +1,4 @@
-ARG TAG=0.1.17
+ARG TAG=0.1.18
 ARG IMAGE=ghcr.io/esgf-nimbus/minimal-notebook
 FROM ${IMAGE}:${TAG}
 

diff --git a/dockerfiles/minimal-notebook-gpu/Makefile b/dockerfiles/minimal-notebook-gpu/Makefile
@@ -1,6 +1,6 @@
 .DEFAULT_GOAL = build
 
-VERSION = 0.1.5
+VERSION = 0.1.6
 
 run: ARGS = -p 8888:8888
 

diff --git a/dockerfiles/minimal-notebook-gpu/changelog.md b/dockerfiles/minimal-notebook-gpu/changelog.md
@@ -1,4 +1,9 @@
 # Changelog
+- Bump minimal-notebook-gpu to 0.1.6 [b68b51a](https://github.com/esgf-nimbus/nimbus/commit/b68b51a) (2024-01-30)
+- Bump minimal-notebook to 0.1.18 [d262229](https://github.com/esgf-nimbus/nimbus/commit/d262229) (2024-01-30)
+  - Removes before_commit hook [5e7bcc8](https://github.com/esgf-nimbus/nimbus/commit/5e7bcc8) (2024-01-30)
+- Bump minimal-notebook-gpu to 0.1.5 [3bb40a8](https://github.com/esgf-nimbus/nimbus/commit/3bb40a8) (2024-01-22)
+  - Updates changelog [2ad017c](https://github.com/esgf-nimbus/nimbus/commit/2ad017c) (2024-01-22)
   - Removes push [eae5d88](https://github.com/esgf-nimbus/nimbus/commit/eae5d88) (2024-01-22)
   - Updates changelog [979951b](https://github.com/esgf-nimbus/nimbus/commit/979951b) (2024-01-22)
   - Fixes hook to update changelog [0b1c626](https://github.com/esgf-nimbus/nimbus/commit/0b1c626) (2024-01-22)

diff --git a/dockerfiles/minimal-notebook-gpu/tbump.toml b/dockerfiles/minimal-notebook-gpu/tbump.toml
@@ -1,5 +1,5 @@
 [version]
-current = "0.1.5"
+current = "0.1.6"
 
 regex = '''
   (?P<major>\d+)
@@ -16,7 +16,3 @@ tag_template = "v{new_version}"
 [[file]]
 src = "Makefile"
 search = "VERSION = {current_version}"
-
-[[before_commit]]
-name = "Update changelog"
-cmd = "make changelog; git add changelog.md; git commit -m 'Updates changelog'"
diff --git a/dockerfiles/minimal-notebook/Dockerfile b/dockerfiles/minimal-notebook/Dockerfile
@@ -35,7 +35,9 @@ RUN groupadd -g 1026 climate && \
         htop \
         iputils-ping \
         dnsutils \
+        texlive-full \
         && \
+    apt-get purge && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     pip install nbgitpuller && \

diff --git a/dockerfiles/minimal-notebook/Makefile b/dockerfiles/minimal-notebook/Makefile
@@ -1,10 +1,10 @@
 .DEFAULT_GOAL = build
 
-VERSION = 0.1.17
+VERSION = 0.1.18
 
 run: ARGS = -p 8888:8888 -v $(PWD)/../dask-gateway/conda-envs:/conda-envs
 
-build: export-env
+build: POST_BUILD = make export-env
 
 .PHONY: export-env
 export-env: ENTRYPOINT = /bin/bash

diff --git a/dockerfiles/minimal-notebook/changelog.md b/dockerfiles/minimal-notebook/changelog.md
@@ -1,4 +1,12 @@
 # Changelog
+  - Fixes exporting environment after minimal-notebook build [320492f](https://github.com/esgf-nimbus/nimbus/commit/320492f) (2024-01-30)
+  - Removes before_commit hook [5e7bcc8](https://github.com/esgf-nimbus/nimbus/commit/5e7bcc8) (2024-01-30)
+  - Fixes hook to update changelog [0b1c626](https://github.com/esgf-nimbus/nimbus/commit/0b1c626) (2024-01-22)
+- Bump minimal-notebook to 0.1.17 [f08468c](https://github.com/esgf-nimbus/nimbus/commit/f08468c) (2024-01-22)
+  - Revert "Bump minimal-notebook to 0.1.17" [7bd85e3](https://github.com/esgf-nimbus/nimbus/commit/7bd85e3) (2024-01-22)
+- Bump minimal-notebook to 0.1.17 [db0c7fd](https://github.com/esgf-nimbus/nimbus/commit/db0c7fd) (2024-01-22)
+  - Removes push after bump [6ec59dc](https://github.com/esgf-nimbus/nimbus/commit/6ec59dc) (2024-01-22)
+  - Adds pcmdi_metrics package [6696776](https://github.com/esgf-nimbus/nimbus/commit/6696776) (2024-01-22)
   - Fixes url [ef95fcb](https://github.com/esgf-nimbus/nimbus/commit/ef95fcb) (2024-01-22)
   - Updates changelog [7ae4ce5](https://github.com/esgf-nimbus/nimbus/commit/7ae4ce5) (2023-09-08)
 - Bump minimal-notebook to 0.1.16 [f17e53c](https://github.com/esgf-nimbus/nimbus/commit/f17e53c) (2023-09-08)

diff --git a/dockerfiles/minimal-notebook/tbump.toml b/dockerfiles/minimal-notebook/tbump.toml
@@ -1,5 +1,5 @@
 [version]
-current = "0.1.17"
+current = "0.1.18"
 
 regex = '''
   (?P<major>\d+)
@@ -20,7 +20,3 @@ search = "VERSION = {current_version}"
 [[file]]
 src = "../minimal-notebook-gpu/Dockerfile"
 search = "TAG={current_version}"
-
-[[before_commit]]
-name = "Update changelog"
-cmd = "make changelog; git add changelog.md; git commit -m 'Updates changelog'"