Skip to content

Commit

Permalink
Enable submodule fetch and fix the image tag
Browse files Browse the repository at this point in the history
  • Loading branch information
podhrmic committed Jun 11, 2024
1 parent fdda7d5 commit d8096a8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
# with:
# submodules: true
# repository: podhrmic/verse-vhost-device
# token: ${{ secrets.VHOST_DEVICE_ACCESS_TOKEN }}
# path: src/pkvm_setup/vhost-device
with:
submodules: true
token: ${{ secrets.VERSE_OPENSUT_ACCESS_TOKEN }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
Expand All @@ -51,6 +49,6 @@ jobs:
password: ${{ secrets.VERSE_OPENSUT_ACCESS_TOKEN }}
- name: Build the Docker image
run: |
docker build . --file Dockerfile --tag galoisinc/opensut-base:latest
docker build . --file Dockerfile --tag $REGISTRY/$OPENSUT_BASE_IMAGE_NAME
- name: Push the Docker image
run: docker push $REGISTRY/$OPENSUT_BASE_IMAGE_NAME
19 changes: 9 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ RUN touch /etc/apt/sources.list \
# deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free
# deb-src http://deb.debian.org/debian-security bookworm-security main contrib non-free

# FIXME
# # TODO: Add resources to the docker image
# ADD src /opt/src
# WORKDIR /opt
# TODO: Add resources to the docker image
ADD src /opt/src
WORKDIR /opt

# # Build the host and guest disk images. This takes 1-2 hours.
# RUN cd src/pkvm_setup \
# && bash create_disk_images.sh
# Build the host and guest disk images. This takes 1-2 hours.
RUN cd src/pkvm_setup \
&& bash create_disk_images.sh

# # Build our patched version of QEMU in the host VM. This takes 1-2 hours.
# RUN cd src/pkvm_setup \
# && bash run_vm_script.sh vms/disk_host.img vm_scripts/install_qemu.sh
# Build our patched version of QEMU in the host VM. This takes 1-2 hours.
RUN cd src/pkvm_setup \
&& bash run_vm_script.sh vms/disk_host.img vm_scripts/install_qemu.sh

0 comments on commit d8096a8

Please sign in to comment.