Skip to content

Commit

Permalink
ci: more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
silv3rr committed Jul 6, 2023
1 parent d8228ac commit 65ef687
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 70 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
pip3 install --upgrade pip wheel setuptools
pip3 install -r requirements.txt
pip3 install pyinstaller sysv-ipc geoip2
./build.sh && mkdir ./build-ubuntu && mv -f *.tar.gz *.sha512sum ./build-ubuntu
- uses: actions/upload-artifact@v3
with:
name: build-ubuntu-artifacts
Expand Down Expand Up @@ -98,10 +99,7 @@ jobs:
pip3 install --upgrade pip wheel setuptools
pip3 install -r requirements.txt
pip3 install pyinstaller sysv-ipc geoip2
./build.sh && mkdir ./build-centos && mv -f *.tar.gz *.sha512sum ./build-centos
# git config --global user.name "${{ env.GIT_USER_NAME }}"
# git config --global user.email "${{ env.GIT_USER_EMAIL }}"
# git pull && git add bin && git commit -m "update centos binary" && git push
./build.sh && mkdir ./build-centos && mv -f *.tar.gz *.sha512sum ./build-centos
- uses: actions/upload-artifact@v2
with:
name: build-centos-artifacts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3
- name: Build images
run: docker build --tag pyspy:latest .
run: docker build --tag ghcr.io/silv3rr/pyspy:latest .
- name: Login to Github Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GHCR_PAT }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Push image
run: |
docker push ghcr.io/silv3rr/pyspy:latest
11 changes: 11 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# syntax=docker/dockerfile:1
FROM python:3.9.17-bookworm
LABEL org.opencontainers.image.source=https://github.com/silv3rr/pyspy
WORKDIR /app
COPY requirements.txt requirements.txt
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=DL3013
RUN pip3 install --no-cache-dir -r requirements.txt && \
pip3 install --no-cache-dir geoip2 flask
COPY . .
ENTRYPOINT ["./spy.py"]
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
Shows users logged into glftpd either in a terminal window or as web page. Like 'gl_spy' and also simular to 'webspy' from foo-tools. Used to be included with [pywho](https://github.com/silv3rr/pywho) but is now its own separate thing.

_cli mode_

![screenshot_cli](docs/cli.png)

_web mode_

![screenshot_web](docs/web.png)

Here's some more [more screenshots](docs/Screenshots.md) and asciinema [demo](docs/Demo.md).
Expand Down Expand Up @@ -39,11 +41,11 @@ No dependencies, just single executable file available to [download](../../relea

Supported: CentOS 7, Debian 11, 12 and Ubuntu 20.04, 22.04

All files on [Releases](../../releases) tab
All files on [Releases](../../releases) tab. Click **Show all .. assets** link at the bottom.

## docker

...
pyspy will be added to [docker-glftpd](https://github.com/silv3rr/docker-glftpd) soon(tm)

## apt

Expand Down
62 changes: 0 additions & 62 deletions templates/who.html

This file was deleted.

0 comments on commit 65ef687

Please sign in to comment.