From: Marcel van der Veldt Date: Thu, 9 Mar 2023 19:41:51 +0000 (+0100) Subject: add cargo deps X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=01995ac4a8258a7acccce5d49198b62f8c0a75b9;p=music-assistant-server.git add cargo deps --- diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index a071f5c4..ac0fda9a 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -36,13 +36,13 @@ jobs: elif [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/} fi - TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}" + TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF},ghcr.io/${DOCKER_IMAGE}:${VERSION},ghcr.io/${DOCKER_IMAGE}:${SHORTREF}" # If the VERSION looks like a version number, assume that # this is the most recent version of the image and also # tag it 'latest'. if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - TAGS="$TAGS,${DOCKER_IMAGE}:latest" + TAGS="$TAGS,${DOCKER_IMAGE}:latest,ghcr.io/${DOCKER_IMAGE}:latest" fi # Set output parameters. diff --git a/Dockerfile b/Dockerfile index ece48b72..6b4d7a52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,13 +21,16 @@ RUN set -x \ build-base \ cmake \ git \ + gcc \ + musl-dev \ linux-headers \ autoconf \ automake \ cargo \ libffi \ libffi-dev \ - git + openssl-dev \ + pkgconfig WORKDIR /wheels COPY requirements_all.txt .