From baee73e7a3014dca695923a87db6e9c75291bf66 Mon Sep 17 00:00:00 2001 From: aced Date: Wed, 5 Feb 2025 04:59:45 -0500 Subject: [PATCH 01/13] Dockerfile created. Final docker image includes ffmpeg-6.0.1 and yt-dl 2025.01.26 --- .gitignore | 3 ++- Dockerfile | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 Dockerfile diff --git a/.gitignore b/.gitignore index 149a5d0..41bc9cd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ output.opus .env *.wav *.opus -*.webm \ No newline at end of file +*.webm +*.tar.gz \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..76aaa28 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,69 @@ +# Use the official Debian Bookworm Slim image as the base +FROM golang:1.22.12-bookworm as build +RUN mkdir /app +WORKDIR /app +COPY ./ /app/ +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 && \ + # go version && \ + go mod download && \ + wget --no-check-certificate -c https://github.com/yt-dlp/yt-dlp/releases/download/2025.01.26/yt-dlp_linux &&\ + wget --no-check-certificate -c https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-6.0.1-amd64-static.tar.xz &&\ + mv yt-dlp_linux /usr/bin/yt-dlp && \ + chmod 755 /usr/bin/yt-dlp && \ + chmod +x /usr/bin/yt-dlp && \ + tar -xf ffmpeg-6.0.1-amd64-static.tar.xz && \ + rm -rf ffmpeg-6.0.1-amd64-static.tar.xz && \ + chmod +x ffmpeg-6.0.1-amd64-static/ffmpeg && \ + chmod +x ffmpeg-6.0.1-amd64-static/ffprobe && \ + cp -R ffmpeg-6.0.1-amd64-static/ffmpeg /usr/bin/ && \ + cp -R ffmpeg-6.0.1-amd64-static/ffprobe /usr/bin/ && \ + rm -rf ffmpeg-6.0.1-amd64-static && \ + useradd papibot && \ + CGO_ENABLED=0 GOOS=linux go build -o /app/papibot + +FROM golang:1.22.12-bookworm +RUN groupadd -r papibot && useradd -r -g papibot papibot +USER papibot +COPY --from=build --chown=papibot:papibot /usr/bin/ /usr/bin +COPY --from=build --chown=papibot:papibot /app/ /app/ + +WORKDIR /app/ +ENTRYPOINT ["./papibot"] -- 2.47.1 From 9fe4e2fad1219402695e4f819ed3221adb7fe14d Mon Sep 17 00:00:00 2001 From: aced Date: Wed, 5 Feb 2025 05:01:21 -0500 Subject: [PATCH 02/13] Dockerfile created. Final docker image includes ffmpeg-6.0.1 and yt-dl 2025.01.26 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 76aaa28..331c639 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Use the official Debian Bookworm Slim image as the base +# Use the official golang:1.22.12-bookworm FROM golang:1.22.12-bookworm as build RUN mkdir /app WORKDIR /app -- 2.47.1 From 369a057a7aab4ee4fbc3577af55ea3f636ad197a Mon Sep 17 00:00:00 2001 From: aced Date: Wed, 5 Feb 2025 05:05:53 -0500 Subject: [PATCH 03/13] Added detailed comments for the Dockerfile --- Dockerfile | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 331c639..9221fe0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,16 @@ -# Use the official golang:1.22.12-bookworm +# Use the official golang:1.22.12-bookworm image as the build stage FROM golang:1.22.12-bookworm as build + +# 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 \ @@ -42,28 +50,48 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libunistring-dev \ libaom-dev \ libdav1d-dev && \ - # go version && \ + # 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 +# Use the official golang:1.22.12-bookworm image for the final stage FROM golang:1.22.12-bookworm + +# 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"] -- 2.47.1 From fe75a2c36fc9801e40e08f8317e15c5394555777 Mon Sep 17 00:00:00 2001 From: aced Date: Wed, 5 Feb 2025 05:25:03 -0500 Subject: [PATCH 04/13] added detailed comments, would still need to clean some of the packages. (tried theres errors as soon you remove some) --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 41bc9cd..d1e5570 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ output.opus *.wav *.opus *.webm -*.tar.gz \ No newline at end of file +*.tar.gz +*.old \ No newline at end of file -- 2.47.1 From 9db97ab6dbb56b87b7ddb4dd1cd8fdbad525aeab Mon Sep 17 00:00:00 2001 From: aced Date: Wed, 5 Feb 2025 05:35:06 -0500 Subject: [PATCH 05/13] added small section for docker in the readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 7965f61..ab5c4a0 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,12 @@ Currently in development. + +## docker +docker build -t papibot . +docker run -d papibot:latest --name papibot + + ## System requirements - `ffmpeg` make sure libopus is included - `yt-dlp` -- 2.47.1 From 0d30bae2d8f31d25298eb7f85cbd86cea6e80775 Mon Sep 17 00:00:00 2001 From: aced Date: Wed, 5 Feb 2025 05:36:45 -0500 Subject: [PATCH 06/13] added small section for docker in the readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index ab5c4a0..b14e760 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ Currently in development. ## docker -docker build -t papibot . -docker run -d papibot:latest --name papibot +docker build -t papibot . ;docker run -d papibot:latest --name papibot ## System requirements -- 2.47.1 From d6ebe0f0e512a4e3afbb9925fc93f062ed5ba646 Mon Sep 17 00:00:00 2001 From: Xander Bazzi Date: Thu, 6 Feb 2025 00:40:08 -0500 Subject: [PATCH 07/13] Dockerize the build process Add docker build commands to README Clean up Dockerfile.runtime --- .gitea/workflows/build-demo.yaml.disabled | 19 ++++++ .gitea/workflows/build-oci.yaml | 47 ++++++++++++++ Dockerfile.builder | 78 +++++++++++++++++++++++ Dockerfile.runtime | 17 +++++ README.md | 7 +- 5 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 .gitea/workflows/build-demo.yaml.disabled create mode 100644 .gitea/workflows/build-oci.yaml create mode 100644 Dockerfile.builder create mode 100644 Dockerfile.runtime diff --git a/.gitea/workflows/build-demo.yaml.disabled b/.gitea/workflows/build-demo.yaml.disabled new file mode 100644 index 0000000..394c807 --- /dev/null +++ b/.gitea/workflows/build-demo.yaml.disabled @@ -0,0 +1,19 @@ +name: Gitea Actions Demo +run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 +on: [push] + +jobs: + Explore-Gitea-Actions: + runs-on: ubuntu-latest + steps: + - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." + - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" + - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." + - name: Check out repository code + uses: actions/checkout@v4 + - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner." + - run: echo "🖥️ The workflow is now ready to test your code on the runner." + - name: List files in the repository + run: | + ls ${{ gitea.workspace }} + - run: echo "🍏 This job's status is ${{ job.status }}." \ No newline at end of file diff --git a/.gitea/workflows/build-oci.yaml b/.gitea/workflows/build-oci.yaml new file mode 100644 index 0000000..678a3a4 --- /dev/null +++ b/.gitea/workflows/build-oci.yaml @@ -0,0 +1,47 @@ +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: www.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 -t $IMAGE . + - + name: Push OCI image + run: | + IMAGE=$REGISTRY/$OWNER/$IMAGE_NAME:$TAG + docker push $IMAGE \ No newline at end of file diff --git a/Dockerfile.builder b/Dockerfile.builder new file mode 100644 index 0000000..49a6862 --- /dev/null +++ b/Dockerfile.builder @@ -0,0 +1,78 @@ +# 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 diff --git a/Dockerfile.runtime b/Dockerfile.runtime new file mode 100644 index 0000000..8e66b82 --- /dev/null +++ b/Dockerfile.runtime @@ -0,0 +1,17 @@ +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"] \ No newline at end of file diff --git a/README.md b/README.md index b14e760..41d02f1 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,9 @@ Populate the discord bot keys `go run .` -type `!` in any channel in the discord while you're in a voice channel. \ No newline at end of file +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: Dockerfile.builder +``` -- 2.47.1 From b86c11e81d60d3cea7fc06764e102421a0dc9f79 Mon Sep 17 00:00:00 2001 From: Xander Bazzi Date: Fri, 14 Feb 2025 00:14:30 -0500 Subject: [PATCH 08/13] Clean up dockerfiles --- .gitignore | 2 +- Dockerfile => Dockerfile.old | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Dockerfile => Dockerfile.old (100%) diff --git a/.gitignore b/.gitignore index d1e5570..957e220 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ output.opus *.opus *.webm *.tar.gz -*.old \ No newline at end of file +#*.old \ No newline at end of file diff --git a/Dockerfile b/Dockerfile.old similarity index 100% rename from Dockerfile rename to Dockerfile.old -- 2.47.1 From e58b6368566960142286ff021d84e13366122516 Mon Sep 17 00:00:00 2001 From: Xander Bazzi Date: Fri, 14 Feb 2025 00:25:18 -0500 Subject: [PATCH 09/13] Remove old Dockerfile --- Dockerfile.old | 97 -------------------------------------------------- 1 file changed, 97 deletions(-) delete mode 100644 Dockerfile.old diff --git a/Dockerfile.old b/Dockerfile.old deleted file mode 100644 index 9221fe0..0000000 --- a/Dockerfile.old +++ /dev/null @@ -1,97 +0,0 @@ -# Use the official golang:1.22.12-bookworm image as the build stage -FROM golang:1.22.12-bookworm as build - -# 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 - -# Use the official golang:1.22.12-bookworm image for the final stage -FROM golang:1.22.12-bookworm - -# 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"] -- 2.47.1 From 0ed9bb1cef3723e3afab6f20714aea74b77bedbd Mon Sep 17 00:00:00 2001 From: Xander Bazzi Date: Fri, 14 Feb 2025 00:27:50 -0500 Subject: [PATCH 10/13] Add .old back into the .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2e6bf3a..c07fc8f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ output.opus *.opus *.webm *.tar.gz -#*.old \ No newline at end of file +*.old \ No newline at end of file -- 2.47.1 From 9b5ea0f41ab20a942673ce888540d570aaf11fb8 Mon Sep 17 00:00:00 2001 From: Xander Bazzi Date: Fri, 14 Feb 2025 00:29:32 -0500 Subject: [PATCH 11/13] Remove unused workflow --- .gitea/workflows/build-demo.yaml.disabled | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .gitea/workflows/build-demo.yaml.disabled diff --git a/.gitea/workflows/build-demo.yaml.disabled b/.gitea/workflows/build-demo.yaml.disabled deleted file mode 100644 index 394c807..0000000 --- a/.gitea/workflows/build-demo.yaml.disabled +++ /dev/null @@ -1,19 +0,0 @@ -name: Gitea Actions Demo -run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 -on: [push] - -jobs: - Explore-Gitea-Actions: - runs-on: ubuntu-latest - steps: - - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" - - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." - - name: Check out repository code - uses: actions/checkout@v4 - - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner." - - run: echo "🖥️ The workflow is now ready to test your code on the runner." - - name: List files in the repository - run: | - ls ${{ gitea.workspace }} - - run: echo "🍏 This job's status is ${{ job.status }}." \ No newline at end of file -- 2.47.1 From dfb7011dc34cae4d8607aaa5b2e5a72fec6a2e8b Mon Sep 17 00:00:00 2001 From: Xander Bazzi Date: Fri, 14 Feb 2025 00:33:34 -0500 Subject: [PATCH 12/13] Point docker build to Dockerfile.builder in workflow --- .gitea/workflows/build-oci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-oci.yaml b/.gitea/workflows/build-oci.yaml index 678a3a4..d58aa2b 100644 --- a/.gitea/workflows/build-oci.yaml +++ b/.gitea/workflows/build-oci.yaml @@ -39,7 +39,7 @@ jobs: name: Build and push OCI image run: | IMAGE=$REGISTRY/$OWNER/$IMAGE_NAME:$TAG - docker build -t $IMAGE . + docker build -f Dockerfile.builder -t $IMAGE . - name: Push OCI image run: | -- 2.47.1 From 94e0054075b8d3105b6ab533a7b9ca6deb9db14f Mon Sep 17 00:00:00 2001 From: Xander Bazzi Date: Fri, 14 Feb 2025 00:34:12 -0500 Subject: [PATCH 13/13] Change domain to new one --- .gitea/workflows/build-oci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-oci.yaml b/.gitea/workflows/build-oci.yaml index d58aa2b..66619c3 100644 --- a/.gitea/workflows/build-oci.yaml +++ b/.gitea/workflows/build-oci.yaml @@ -12,7 +12,7 @@ jobs: container: image: catthehacker/ubuntu:act-latest env: - REGISTRY: www.gitgud.foo + REGISTRY: gitgud.foo OWNER: thegrind TAG: 1.0.0 IMAGE_NAME: test -- 2.47.1