1 Commits

Author SHA1 Message Date
811b7f9321 Add shell.nix 2025-09-28 16:45:58 -04:00
8 changed files with 16 additions and 157 deletions

1
.envrc Normal file
View File

@@ -0,0 +1 @@
use nix;

View File

@@ -1,47 +0,0 @@
name: Container Build & Push
# add on pull requests too
on:
push:
branches:
- master
jobs:
build:
runs-on: ubuntu-latest
container:
image: catthehacker/ubuntu:act-latest
env:
REGISTRY: gitgud.foo
OWNER: thegrind
TAG: 1.0.0
IMAGE_NAME: test
steps:
-
name: Check out code
uses: actions/checkout@v3
- name: whereami
run: ls -lath
-
name: get dicks space
run: |
df -h
-
name: Log in to the GitGud container registry
run: |
/usr/bin/docker login $REGISTRY \
-u "${{ gitea.actor }}" \
-p "${{ secrets.REGISTRY_PASSWORD }}"
-
name: Build and push OCI image
run: |
IMAGE=$REGISTRY/$OWNER/$IMAGE_NAME:$TAG
docker build -f Dockerfile.builder -t $IMAGE .
-
name: Push OCI image
run: |
IMAGE=$REGISTRY/$OWNER/$IMAGE_NAME:$TAG
docker push $IMAGE

3
.gitignore vendored
View File

@@ -6,5 +6,4 @@ output.opus
*.wav *.wav
*.opus *.opus
*.webm *.webm
*.tar.gz vid.*
*.old

View File

@@ -1,78 +0,0 @@
# Use the official golang:1.22.12-bookworm image as the build stage
FROM golang:1.22.12-bookworm
# Create a directory /app
RUN mkdir /app
# Set the working directory to /app
WORKDIR /app
# Copy the current directory contents into /app
COPY ./ /app/
# Update the package list and install necessary packages
RUN apt-get update && apt-get install -y --no-install-recommends \
curl \
wget \
vim \
git \
debconf \
ca-certificates \
tar \
autoconf \
automake \
build-essential \
cmake \
git-core \
libass-dev \
libfreetype6-dev \
libgnutls28-dev \
libmp3lame-dev \
libsdl2-dev \
libtool \
libva-dev \
libvdpau-dev \
libvorbis-dev \
libxcb1-dev \
libxcb-shm0-dev \
libxcb-xfixes0-dev \
meson \
ninja-build \
pkg-config \
texinfo \
yasm \
zlib1g-dev \
libx264-dev \
libx265-dev \
libnuma-dev \
libvpx-dev \
libopus-dev \
libunistring-dev \
libaom-dev \
libdav1d-dev && \
# Download Go module dependencies
go mod download && \
# Download yt-dlp
wget --no-check-certificate -c https://github.com/yt-dlp/yt-dlp/releases/download/2025.01.26/yt-dlp_linux &&\
# Download ffmpeg
wget --no-check-certificate -c https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-6.0.1-amd64-static.tar.xz &&\
# Move yt-dlp to /usr/bin and set permissions
mv yt-dlp_linux /usr/bin/yt-dlp && \
chmod 755 /usr/bin/yt-dlp && \
chmod +x /usr/bin/yt-dlp && \
# Extract ffmpeg tarball
tar -xf ffmpeg-6.0.1-amd64-static.tar.xz && \
# Remove the tarball
rm -rf ffmpeg-6.0.1-amd64-static.tar.xz && \
# Set execute permissions for ffmpeg and ffprobe
chmod +x ffmpeg-6.0.1-amd64-static/ffmpeg && \
chmod +x ffmpeg-6.0.1-amd64-static/ffprobe && \
# Copy ffmpeg and ffprobe to /usr/bin
cp -R ffmpeg-6.0.1-amd64-static/ffmpeg /usr/bin/ && \
cp -R ffmpeg-6.0.1-amd64-static/ffprobe /usr/bin/ && \
# Remove the extracted ffmpeg directory
rm -rf ffmpeg-6.0.1-amd64-static && \
# Create a new user 'papibot'
useradd papibot && \
# Build the Go application
CGO_ENABLED=0 GOOS=linux go build -o /app/papibot

View File

@@ -1,17 +0,0 @@
FROM www.gitgud.foo/thegrind/papibot-builder:latest as build
# Create a group and user 'papibot'
RUN groupadd -r papibot && useradd -r -g papibot papibot
# Switch to the 'papibot' user
USER papibot
# Copy the necessary files from the build stage
COPY --from=build --chown=papibot:papibot /usr/bin/ /usr/bin
COPY --from=build --chown=papibot:papibot /app/ /app/
# Set the working directory to /app
WORKDIR /app/
# Set the entry point to the built Go application
ENTRYPOINT ["./papibot"]

View File

@@ -2,11 +2,6 @@
Currently in development. Currently in development.
## docker
docker build -t papibot . ;docker run -d papibot:latest --name papibot
## System requirements ## System requirements
- `ffmpeg` make sure libopus is included - `ffmpeg` make sure libopus is included
- `yt-dlp` - `yt-dlp`
@@ -21,11 +16,6 @@ Populate the discord bot keys
type `!` in any channel in the discord while you're in a voice channel. type `!` in any channel in the discord while you're in a voice channel.
## Build new builder container image
```
docker build -t www.gitgud.foo/thegrind/papibot-builder:<tag> Dockerfile.builder
```
## Running tests locally ## Running tests locally
`make test` `make test`

View File

@@ -127,7 +127,7 @@ func playOnVoiceChannel(voiceChannel *dg.VoiceConnection) {
log.Println("Playing sound") log.Println("Playing sound")
for _, p := range frames { for _, p := range frames {
log.Printf("Sending packet: %d bytes", len(p)) log.Printf("Sending packet %d", len(p))
voiceChannel.OpusSend <- p voiceChannel.OpusSend <- p
} }
} }

11
shell.nix Normal file
View File

@@ -0,0 +1,11 @@
{
pkgs ? import <nixpkgs> { },
}:
pkgs.mkShell {
buildInputs = with pkgs; [
yt-dlp
ffmpeg
];
shellHook = '''';
}