Skip to content

Commit

Permalink
fix makefile run command, add missing runtime deps, fix CI image tag,…
Browse files Browse the repository at this point in the history
… and disable cache for testing purposes
  • Loading branch information
Arian04 committed Feb 13, 2024
1 parent a2fe7e9 commit 653dbf5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches: ["main"]

# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository_owner }}/PyTAS
Expand Down Expand Up @@ -38,5 +37,7 @@ jobs:
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
no-cache: true # just here temporarily for debugging a thing
#tags: ${{ steps.meta.outputs.tags }}
tags: latest
labels: ${{ steps.meta.outputs.labels }}
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ FROM $BASE_IMAGE:$BASE_IMAGE_TAG

ENV PIP_DISABLE_PIP_VERSION_CHECK=1

# runtime dependencies (figured this out by running it and adding a package every time it said there was a .so file missing)
RUN apt-get update -y && \
apt-get -y --no-install-recommends install libgtk-3-0 libxxf86vm1 libnotify4 libxtst6 libsdl2-2.0-0 libgl1 libegl1 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# install wheel files
WORKDIR /build
COPY --from=builder_wheels /build /build
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build:
docker build . -t pytas:latest
docker build . -t ghcr.io/arian04/pytas:latest
run:
# This is a bad way to run an appplication honestly, but I'm working on improving it
xhost +SI:localuser:$(id -un)
docker run --rm --name PyTAS --ipc=host --user $(id -u):$(id -g) --volume=${XAUTHORITY} -e DISPLAY -e XAUTHORITY -it pytas:latest
docker run --rm --name PyTAS --ipc=host --user $(id -u):$(id -g) --volume=/tmp/.X11-unix/:/tmp/.X11-unix/ -e DISPLAY -e XAUTHORITY ghcr.io/arian04/pytas:latest

0 comments on commit 653dbf5

Please sign in to comment.