Revert "Return to kontrol-kup"

This reverts commit e234dc3.
runtimeverification · Oct 10, 2023 · c456c41 · c456c41
1 parent e234dc3
commit c456c41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/actions/with-docker/action.yml b/.github/actions/with-docker/action.yml
@@ -23,9 +23,9 @@ runs:
         --tty                                                       \
         --detach                                                    \
         --user root                                                 \
-        --workdir /home/ubuntu/workspace                            \
-        ghcr.io/runtimeverification/devops/kontrol-kup:${KONTROL_RELEASE}
+        --workdir /home/user/workspace                            \
+        runtimeverificationinc/kontrol:ubuntu-jammy-${KONTROL_RELEASE}
 
       # Copy the current Checkout direcotry into the container
-      docker cp . ${CONTAINER_NAME}:/home/ubuntu/workspace
-      docker exec ${CONTAINER_NAME} chown -R ubuntu:ubuntu /home/ubuntu
+      docker cp . ${CONTAINER_NAME}:/home/user/workspace
+      docker exec ${CONTAINER_NAME} chown -R user:user /home/user
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -32,9 +32,8 @@ jobs:
       - name: Docker Login w/ Github Token
         uses: docker/login-action@v1
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: rvdockerhub
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: "Start Docker Container"
         uses: ./.github/actions/with-docker
@@ -44,7 +43,7 @@ jobs:
       - name: 'Test New Tool Versions'
         run: |
           # Run the following in the running docker container
-          docker exec -u ubuntu ${{ env.repository_basename }}-ci bash -c './test/run-kevm.sh'
+          docker exec -u user ${{ env.repository_basename }}-ci bash -c './test/run-kevm.sh'
 
       - name: 'Stop Docker Container'
         if: always()