diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6750b41d..f32f9201 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Deploy release on: push: tags: - - "v3.*.*" + - "3.*.*" workflow_dispatch: jobs: @@ -60,10 +60,11 @@ jobs: uses: docker/metadata-action@v4 with: images: | - name/app + ghcr.io/seriousm4x/UpSnap tags: | - type=ref,event=push tag + type=ref,event=tag type=semver,pattern={{version}} + type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} # qemu diff --git a/Dockerfile b/Dockerfile index db8a9e99..6aaeb5a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,14 @@ ARG TARGETVARIANT ARG VERSION ENV BUILDX_ARCH="${TARGETOS:-linux}_${TARGETARCH:-amd64}${TARGETVARIANT}" WORKDIR /app -RUN wget https://github.com/seriousm4x/upsnap/releases/download/v${VERSION}/upsnap_${VERSION}_${BUILDX_ARCH}.zip &&\ - unzip upsnap_${VERSION}_${BUILDX_ARCH}.zip &&\ - chmod +x /upsnap +RUN wget https://github.com/seriousm4x/UpSnap/releases/download/${VERSION}/UpSnap_${VERSION}_${BUILDX_ARCH}.zip &&\ + unzip UpSnap_${VERSION}_${BUILDX_ARCH}.zip &&\ + rm -f UpSnap_${VERSION}_${BUILDX_ARCH}.zip &&\ + chmod +x upsnap FROM alpine:3 RUN apk update &&\ - apk add --no-cache ca-certificates nmap samba-common-tools &&\ + apk add --no-cache tzdata ca-certificates nmap samba-common-tools &&\ rm -rf /var/cache/apk/* WORKDIR /app COPY --from=downloader /app/upsnap upsnap diff --git a/backend/.goreleaser.yaml b/backend/.goreleaser.yaml index 966f3424..bf6fb948 100644 --- a/backend/.goreleaser.yaml +++ b/backend/.goreleaser.yaml @@ -1,5 +1,5 @@ release: - draft: true + # draft: true prerelease: auto before: hooks: diff --git a/docker-compose.yml b/docker-compose.yml index 8ca7bc4b..0466e99e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,18 @@ version: "3" services: upsnap: - image: ghcr.io/seriousm4x/UpSnap + image: ghcr.io/seriousm4x/upsnap:3 network_mode: host - command: ["./upsnap", "serve", "--http", "0.0.0.0:8090"] + volumes: + - ./data:/app/pb_data healthcheck: test: wget --no-verbose --tries=1 --spider http://localhost:8090/api/health || exit 1 interval: 1m timeout: 10s retries: 3 + # environment: + # - TZ=Europe/Berlin + # - UPSNAP_INTERVAL=@every 10s + # - UPSNAP_SCAN_RANGE=192.168.1.0/24 + # - UPSNAP_WEBSITE_TITLE=Custom name + # command: ["./upsnap", "serve", "--http", "0.0.0.0:8090"]