create venv in ghdl/build:doc

ghdl · Jul 19, 2023 · 1a3c4f5 · 1a3c4f5
1 parent 0c13e1e
commit 1a3c4f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -54,7 +54,10 @@ jobs:
       run: |
         docker build -t ghdl/build:doc . -f- <<-EOF
         FROM ghdl/build:bookworm-mcode
-        RUN apt update -qq && apt install -y python3-pip graphviz
+        RUN apt update -qq && apt install -y python3-pip python3-venv graphviz
+        ENV VIRTUAL_ENV=/opt/venv
+        RUN python3 -m venv \$VIRTUAL_ENV
+        ENV PATH="$VIRTUAL_ENV/bin:\$PATH"
         EOF
 
     - name: Deploy to DockerHub

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -48,11 +48,12 @@ jobs:
         TARGS: ${{ matrix.args }}
 
     - name: 'Build ghdl/debug'
+      # We need to use 'buster' because 'gnat-gps' is not available on 'bullseye' or 'bookworm'
       if: matrix.backend == 'mcode' && matrix.distro == 'buster'
       run: |
         docker build -t ghdl/debug - <<-EOF
         FROM ghdl/debug:base
-        COPY --from=ghdl/pkg:bookworm-mcode / /ghdl/usr/local/
+        COPY --from=ghdl/pkg:buster-mcode / /ghdl/usr/local/
         EOF
 
     - name: Deploy to DockerHub