Try upgrade expat in image again

praekeltfoundation · Feb 15, 2022 · b5c9ae3 · b5c9ae3
1 parent 23ad805
commit b5c9ae3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -148,7 +148,9 @@ jobs:
           push: ${{github.event_name != 'pull_request'}}
           tags: ${{steps.meta.outputs.tags}}
           build-args: |
-            FROM_IMAGE=localhost:5000/local/${{matrix.python}}:${{matrix.version}}${{matrix.version_suffix}}-slim-${{matrix.dist}}
+            FROM_IMAGE=${{matrix.python}}:${{matrix.version}}${{matrix.version_suffix}}-slim-${{matrix.dist}}
+          # build-args: |
+          #   FROM_IMAGE=localhost:5000/local/${{matrix.python}}:${{matrix.version}}${{matrix.version_suffix}}-slim-${{matrix.dist}}
       - name: Snyk Container Test
         continue-on-error: true
         uses: snyk/actions/docker@master

diff --git a/Dockerfile.no-wheelhouse b/Dockerfile.no-wheelhouse
@@ -27,7 +27,8 @@ ENV PATH $PATH:/scripts
 # Note that gosu/dumb-init are only available from Debian Stretch, tini should
 # be available on Buster.
 RUN set -xe; \
-    apt-get-install.sh dumb-init gosu; \
+# (Re)install expat to get a newer version
+    apt-get-install.sh dumb-init gosu expat; \
 # Link `gosu` as `su-exec` for compatibility with Alpine Linux
     ln -s "$(which gosu)" /usr/local/sbin/su-exec; \
     gosu nobody true; \