Merge branch 'main' into tfoote-patch-1

.github/workflows/test-build.yaml

@@ -8,7 +8,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

setup.py

@@ -9,7 +9,7 @@
 
 setuptools.setup(
     name='ghrocker',
-    version="0.0.7",
+    version="0.0.9",
     packages=['ghrocker'],
     package_dir={'': 'src'},
     package_data={'ghrocker': ['templates/*.em']},
@@ -22,7 +22,7 @@
     license='Apache 2.0',
     install_requires=[
         'empy',
-        'rocker',
+        'rocker>=0.2.13',
     ],
     install_package_data=True,
     zip_safe=False,

src/ghrocker/ghpages_extension.py

@@ -20,7 +20,7 @@
 
 
 from rocker.extensions import RockerExtension
-
+from rocker.em import empy_expand
 
 class GHPages(RockerExtension):
 
@@ -39,7 +39,7 @@ def get_preamble(self, cli_args):
 
     def get_snippet(self, cliargs):
         snippet = pkgutil.get_data('ghrocker', 'templates/%s_snippet.Dockerfile.em' % self.get_name()).decode('utf-8')
-        return em.expand(snippet, {})
+        return empy_expand(snippet, {})
 
     def get_docker_args(self, cli_args):
         args = ' -w /tmp/jekyll'

src/ghrocker/ghrocker.py

@@ -55,7 +55,7 @@ def main():
     active_extensions = extension_manager.get_active_extensions(args_dict)
     print("Active extensions %s" % [e.get_name() for e in active_extensions])
 
-    dig = DockerImageGenerator(active_extensions, args_dict, 'ubuntu:jammy')
+    dig = DockerImageGenerator(active_extensions, args_dict, 'ruby:3.1-bookworm')
 
     exit_code = dig.build(**vars(args))
     if exit_code != 0:

src/ghrocker/templates/ghpages_snippet.Dockerfile.em

@@ -1,5 +1,4 @@
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install -q -y curl net-tools python3 python3-yaml build-essential nodejs ruby-full autoconf automake libtool pkg-config zlib1g-dev
 RUN echo "gem: --no-document" > ~/.gemrc
 RUN gem install bundler
 RUN gem install jekyll