diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index c927f2d..4518c19 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -58,21 +58,15 @@ jobs: echo "Top-level files:" ls -la - DOCKERFILE="$(find "$PWD" -path "*/scripts/docker/Dockerfile" -print -quit)" - if [ -z "$DOCKERFILE" ]; then - echo "Could not find scripts/docker/Dockerfile in workspace." - find "$PWD" -maxdepth 3 -type f | sort | head -200 + if [ ! -f Dockerfile ]; then + echo "Could not find root Dockerfile in workspace." exit 1 fi - BUILD_CONTEXT="$(dirname "$(dirname "$(dirname "$DOCKERFILE")")")" - echo "Dockerfile: $DOCKERFILE" - echo "Build context: $BUILD_CONTEXT" - docker build \ - -f "$DOCKERFILE" \ + -f Dockerfile \ -t ${{ env.REGISTRY_IMAGE }}:latest \ -t ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} \ - "$BUILD_CONTEXT" + . docker push ${{ env.REGISTRY_IMAGE }}:latest docker push ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..0647806 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM monica:4-apache + +LABEL org.opencontainers.image.title="MischCRM" \ + org.opencontainers.image.description="MischLabs packaged Monica CRM image for Gitea Registry and Watchtower deployment." \ + org.opencontainers.image.source="https://git.mischlabs.de/MrDiderot/CRM"