Skip to content

Commit

Permalink
cleanup and updated build
Browse files Browse the repository at this point in the history
  • Loading branch information
geek-at committed Nov 11, 2023
1 parent d79091f commit 9d2dc7b
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 7,770 deletions.
31 changes: 27 additions & 4 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
id: prep
run: |
DOCKER_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
DOCKER_IMAGE_HUB="docker.io/${{ env.IMAGE_NAME }}"
VERSION=latest
SHORTREF=${GITHUB_SHA::8}
Expand All @@ -29,18 +30,23 @@ jobs:
VERSION=${GITHUB_REF#refs/tags/v}
fi
TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}"
TAGS_HUB="${DOCKER_IMAGE_HUB}:${VERSION},${DOCKER_IMAGE_HUB}:${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_HUB="$TAGS_HUB,${DOCKER_IMAGE_HUB}:latest"
fi
# Set output parameters.
echo ::set-output name=tags::${TAGS}
echo ::set-output name=docker_image::${DOCKER_IMAGE}
echo ::set-output name=tags_hub::${TAGS_HUB}
echo ::set-output name=docker_image_hub::${DOCKER_IMAGE_HUB}
- name: Set up QEMU
uses: docker/setup-qemu-action@master
with:
Expand All @@ -50,19 +56,36 @@ jobs:
id: buildx
uses: docker/setup-buildx-action@master

- name: Log in to the Container registry
- name: Log in to Github Packages
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
registry: docker.io
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and push to GHCR
uses: docker/build-push-action@v2
with:
builder: ${{ steps.buildx.outputs.name }}
context: .
file: docker/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.prep.outputs.tags }}

- name: Build and push to Docker Hub
uses: docker/build-push-action@v2
with:
builder: ${{ steps.buildx.outputs.name }}
context: .
file: docker/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.prep.outputs.tags }}
tags: ${{ steps.prep.outputs.tags_hub }}
157 changes: 0 additions & 157 deletions web/api.php

This file was deleted.

4 changes: 4 additions & 0 deletions web/css/opentrashmail.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ tr.htmx-swapping td {
display:none;
}

.text-center {
text-align: center;
}


/* pico css overrides */

Expand Down
3 changes: 3 additions & 0 deletions web/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
'settings'=>loadSettings(),
]));
}
else if(count($url)==1 && $url[0] == 'api') {
exit($backend->renderTemplate('intro.html'));
}


$answer = $backend->run();
Expand Down
Loading

0 comments on commit 9d2dc7b

Please sign in to comment.