diff --git a/Gemfile.lock b/Gemfile.lock index cd6e84a..4843a96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - ood_packaging (0.13.0) + ood_packaging (0.13.1) rake (~> 13.0.1) GEM diff --git a/lib/ood_packaging/build_box/docker-image/Dockerfile.erb b/lib/ood_packaging/build_box/docker-image/Dockerfile.erb index 5b304ed..6a2e4c7 100644 --- a/lib/ood_packaging/build_box/docker-image/Dockerfile.erb +++ b/lib/ood_packaging/build_box/docker-image/Dockerfile.erb @@ -42,7 +42,7 @@ RUN apt update -y && apt install -y apt-transport-https ca-certificates \ init debhelper devscripts dh-make build-essential apt-cudf lintian equivs \ sudo rake wget curl ruby bundler && \ apt clean all -y -<% if arch != 'ppc64le' %> +<% if ! ['bookworm'].include?(codename) && arch != 'ppc64le' %> RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x <%= codename %> main" > /etc/apt/sources.list.d/nodesource.list RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nodesource.gpg <% end %> diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb index 98f5c1d..1adcb8d 100644 --- a/lib/ood_packaging/version.rb +++ b/lib/ood_packaging/version.rb @@ -2,7 +2,7 @@ # Version code for OodPackaging module OodPackaging - VERSION = '0.13.0' + VERSION = '0.13.1' PACKAGE_VERSION = { 'ondemand-release' => { '(ubuntu|debian)' => '3.1.0', diff --git a/packages/ondemand-release-latest/deb/debian/rules b/packages/ondemand-release-latest/deb/debian/rules index 0c59476..f541254 100755 --- a/packages/ondemand-release-latest/deb/debian/rules +++ b/packages/ondemand-release-latest/deb/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # You must remove unused comment lines for the released package. export DH_VERBOSE = 1 -export CODENAME = $(shell lsb_release -sc) +export CODENAME = $(shell lsb_release -sc 2>/dev/null) export WEB_DESTDIR = $(CURDIR)/debian/ondemand-release-web-latest export DEB_BUILD_OPTIONS=nocheck export NODEREPO=node_18.x @@ -21,7 +21,7 @@ override_dh_auto_install: echo "deb https://apt.osc.edu/ondemand/latest/web/apt $(CODENAME) main" > $(WEB_DESTDIR)/etc/apt/sources.list.d/ondemand-web.list install -m 644 -D $(CURDIR)/ondemand.gpg $(WEB_DESTDIR)/etc/apt/trusted.gpg.d/ondemand-web.gpg # Debian 12 (bookworm) has NodeJS 18 in OS repos -ifeq ($(CODENAME),"bookworm") +ifeq ($(CODENAME),bookworm) else echo "deb https://deb.nodesource.com/$(NODEREPO) $(CODENAME) main" > $(WEB_DESTDIR)/etc/apt/sources.list.d/nodesource.list curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > $(WEB_DESTDIR)/etc/apt/trusted.gpg.d/nodesource.gpg diff --git a/packages/ondemand-release/deb/debian/rules b/packages/ondemand-release/deb/debian/rules index 3655f6b..10ffc8a 100755 --- a/packages/ondemand-release/deb/debian/rules +++ b/packages/ondemand-release/deb/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # You must remove unused comment lines for the released package. export DH_VERBOSE = 1 -export CODENAME = $(shell lsb_release -sc) +export CODENAME = $(shell lsb_release -sc 2>/dev/null) export WEB_DESTDIR = $(CURDIR)/debian/ondemand-release-web export DEB_BUILD_OPTIONS=nocheck export VERSION_MAJOR = $(shell echo "$(VERSION)" | cut -d'.' -f1) @@ -24,7 +24,7 @@ override_dh_auto_install: echo "deb https://apt.osc.edu/ondemand/$(REPO)/web/apt $(CODENAME) main" > $(WEB_DESTDIR)/etc/apt/sources.list.d/ondemand-web.list install -m 644 -D $(CURDIR)/ondemand.gpg $(WEB_DESTDIR)/etc/apt/trusted.gpg.d/ondemand-web.gpg # Debian 12 (bookworm) has NodeJS 18 in OS repos -ifeq ($(CODENAME),"bookworm") +ifeq ($(CODENAME),bookworm) else echo "deb https://deb.nodesource.com/$(NODEREPO) $(CODENAME) main" > $(WEB_DESTDIR)/etc/apt/sources.list.d/nodesource.list curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > $(WEB_DESTDIR)/etc/apt/trusted.gpg.d/nodesource.gpg