From 8b6be7a2fc65d5fdbdf37a442d51851a9522bc07 Mon Sep 17 00:00:00 2001 From: Squeaky Date: Mon, 26 Feb 2024 14:04:16 +0100 Subject: [PATCH] Even more WIP --- .github/workflows/build-and-release.yaml | 3 +++ Dockerfile | 11 ++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 145a25d40..6ada41689 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -88,6 +88,9 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 + - name: Docker system info + run: docker info + - name: Set up Docker context for Buildx id: buildx-context run: | diff --git a/Dockerfile b/Dockerfile index df8046517..ab7b345a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,22 +44,19 @@ RUN mkdir /etc/inboxapp && \ mkdir /opt/app && \ chown sync-engine:sync-engine /opt/app && \ mkdir /opt/venv && \ - chown sync-engine:sync-engine /opt/venv && \ - mkdir -p /home/sync-engine/.cache/pip && \ - chown sync-engine:sync-engine /home/sync-engine/.cache/pip + chown sync-engine:sync-engine /opt/venv WORKDIR /opt/app COPY --chown=sync-engine:sync-engine requirements/ /opt/app/requirements -RUN --mount=type=cache,target=/root/.cache/pip \ +RUN --mount=type=cache,target=/root/.cache/pip,id=sync-engine-pip-cache \ python3 -m pip install pip==23.3.1 virtualenv==20.17.1 && \ python3 -m virtualenv /opt/venv && \ /opt/venv/bin/python3 -m pip install setuptools==67.4.0 && \ /opt/venv/bin/python3 -m pip install --no-deps -r requirements/prod.txt -r requirements/test.txt && \ /opt/venv/bin/python3 -m pip check && \ - /usr/bin/find ~/.cache/pip -name "*.whl" + /usr/bin/find ~/.cache/pip -name "*.whl" RUN ln -s /opt/app/bin/wait-for-it.sh /opt/venv/bin/ - USER sync-engine @@ -74,7 +71,7 @@ COPY --chown=sync-engine:sync-engine ./ ./ # /opt/venv/bin/python3 -m pip install --no-deps -r requirements/prod.txt -r requirements/test.txt && \ # /opt/venv/bin/python3 -m pip install -e . && \ # /opt/venv/bin/python3 -m pip check -RUN /usr/bin/find ~/.cache/pip -name "*.whl" + ENV \