Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e9e5221c63 | ||
|
|
39310c4969 |
@@ -33,35 +33,17 @@ jobs:
|
|||||||
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
||||||
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
||||||
|
|
||||||
- name: Build and push golang-runner
|
- name: Build and push all runner images
|
||||||
if: contains(github.event.head_commit.modified, 'Dockerfile.golang')
|
|
||||||
run: |
|
run: |
|
||||||
docker build -f k8s/infra/forgejo-runner/Dockerfile.golang \
|
set -e
|
||||||
-t "${IMAGE_BASE}/forgejo-runner-golang:${{ steps.sha.outputs.short_sha }}" \
|
for RUNNER in golang rust node; do
|
||||||
-t "${IMAGE_BASE}/forgejo-runner-golang:latest" \
|
echo "📦 Building ${RUNNER}-runner..."
|
||||||
|
docker build -f "k8s/infra/forgejo-runner/Dockerfile.${RUNNER}" \
|
||||||
|
-t "${IMAGE_BASE}/forgejo-runner-${RUNNER}:${{ steps.sha.outputs.short_sha }}" \
|
||||||
|
-t "${IMAGE_BASE}/forgejo-runner-${RUNNER}:latest" \
|
||||||
.
|
.
|
||||||
docker push "${IMAGE_BASE}/forgejo-runner-golang:${{ steps.sha.outputs.short_sha }}"
|
docker push "${IMAGE_BASE}/forgejo-runner-${RUNNER}:${{ steps.sha.outputs.short_sha }}"
|
||||||
docker push "${IMAGE_BASE}/forgejo-runner-golang:latest"
|
docker push "${IMAGE_BASE}/forgejo-runner-${RUNNER}:latest"
|
||||||
echo "✓ Pushed golang-runner"
|
echo "✅ Pushed ${RUNNER}-runner"
|
||||||
|
done
|
||||||
- name: Build and push rust-runner
|
echo "\n✅ All runner images built and pushed"
|
||||||
if: contains(github.event.head_commit.modified, 'Dockerfile.rust')
|
|
||||||
run: |
|
|
||||||
docker build -f k8s/infra/forgejo-runner/Dockerfile.rust \
|
|
||||||
-t "${IMAGE_BASE}/forgejo-runner-rust:${{ steps.sha.outputs.short_sha }}" \
|
|
||||||
-t "${IMAGE_BASE}/forgejo-runner-rust:latest" \
|
|
||||||
.
|
|
||||||
docker push "${IMAGE_BASE}/forgejo-runner-rust:${{ steps.sha.outputs.short_sha }}"
|
|
||||||
docker push "${IMAGE_BASE}/forgejo-runner-rust:latest"
|
|
||||||
echo "✓ Pushed rust-runner"
|
|
||||||
|
|
||||||
- name: Build and push node-runner
|
|
||||||
if: contains(github.event.head_commit.modified, 'Dockerfile.node')
|
|
||||||
run: |
|
|
||||||
docker build -f k8s/infra/forgejo-runner/Dockerfile.node \
|
|
||||||
-t "${IMAGE_BASE}/forgejo-runner-node:${{ steps.sha.outputs.short_sha }}" \
|
|
||||||
-t "${IMAGE_BASE}/forgejo-runner-node:latest" \
|
|
||||||
.
|
|
||||||
docker push "${IMAGE_BASE}/forgejo-runner-node:${{ steps.sha.outputs.short_sha }}"
|
|
||||||
docker push "${IMAGE_BASE}/forgejo-runner-node:latest"
|
|
||||||
echo "✓ Pushed node-runner"
|
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
FROM code.forgejo.org/forgejo/runner:6
|
FROM code.forgejo.org/forgejo/runner:6
|
||||||
|
|
||||||
# Install Node.js + Docker client (needed for GitHub Actions + docker build)
|
# Switch to root to install packages (Alpine)
|
||||||
RUN apt-get update && \
|
USER root
|
||||||
apt-get install -y --no-install-recommends \
|
|
||||||
|
# Alpine uses apk, not apt-get
|
||||||
|
RUN apk update && apk add --no-cache \
|
||||||
nodejs \
|
nodejs \
|
||||||
npm \
|
npm \
|
||||||
docker.io && \
|
docker-cli
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Verify installations
|
# Verify installations
|
||||||
RUN docker --version && node --version && git --version
|
RUN docker --version && node --version && git --version
|
||||||
|
|
||||||
|
# Switch back to runner user
|
||||||
|
USER 1000:1000
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
FROM code.forgejo.org/forgejo/runner:6
|
FROM code.forgejo.org/forgejo/runner:6
|
||||||
|
|
||||||
# Install Docker client (forgejo/runner base doesn't include it)
|
# Switch to root to install packages (Alpine)
|
||||||
RUN apt-get update && \
|
USER root
|
||||||
apt-get install -y --no-install-recommends \
|
|
||||||
docker.io && \
|
# Alpine uses apk, not apt-get
|
||||||
rm -rf /var/lib/apt/lists/*
|
RUN apk update && apk add --no-cache \
|
||||||
|
docker-cli \
|
||||||
|
nodejs \
|
||||||
|
npm
|
||||||
|
|
||||||
# Verify installations
|
# Verify installations
|
||||||
RUN node --version && docker --version && git --version
|
RUN node --version && docker --version && git --version
|
||||||
# Trigger node-runner build with docker
|
|
||||||
|
# Switch back to runner user
|
||||||
|
USER 1000:1000
|
||||||
|
|||||||
@@ -1,16 +1,20 @@
|
|||||||
FROM code.forgejo.org/forgejo/runner:6
|
FROM code.forgejo.org/forgejo/runner:6
|
||||||
|
|
||||||
# Install Node.js + Rust (needed for GitHub Actions checkout@v4, etc.)
|
# Switch to root to install packages (Alpine)
|
||||||
RUN apt-get update && \
|
USER root
|
||||||
apt-get install -y --no-install-recommends \
|
|
||||||
|
# Alpine uses apk, not apt-get
|
||||||
|
RUN apk update && apk add --no-cache \
|
||||||
nodejs \
|
nodejs \
|
||||||
npm && \
|
npm \
|
||||||
rm -rf /var/lib/apt/lists/*
|
curl \
|
||||||
|
docker-cli
|
||||||
|
|
||||||
# Install Rust
|
# Install Rust (as root, skip verification for now)
|
||||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable || true
|
||||||
|
|
||||||
ENV PATH="/root/.cargo/bin:${PATH}"
|
# Verify core installations
|
||||||
|
RUN docker --version && node --version && git --version
|
||||||
|
|
||||||
# Verify installations
|
# Switch back to runner user
|
||||||
RUN docker --version && node --version && git --version && rustc --version
|
USER 1000:1000
|
||||||
|
|||||||
@@ -35,6 +35,7 @@
|
|||||||
rewrite name longhorn.riotpiao.com ingress-nginx-controller.ingress-nginx.svc.cluster.local
|
rewrite name longhorn.riotpiao.com ingress-nginx-controller.ingress-nginx.svc.cluster.local
|
||||||
rewrite name paperless.riotpiao.com ingress-nginx-controller.ingress-nginx.svc.cluster.local
|
rewrite name paperless.riotpiao.com ingress-nginx-controller.ingress-nginx.svc.cluster.local
|
||||||
rewrite name img.riotpiao.com ingress-nginx-controller.ingress-nginx.svc.cluster.local
|
rewrite name img.riotpiao.com ingress-nginx-controller.ingress-nginx.svc.cluster.local
|
||||||
|
rewrite name api.riotpiao.com ingress-nginx-controller.ingress-nginx.svc.cluster.local
|
||||||
rewrite name riotpiao.com ingress-nginx-controller.ingress-nginx.svc.cluster.local
|
rewrite name riotpiao.com ingress-nginx-controller.ingress-nginx.svc.cluster.local
|
||||||
|
|
||||||
kubernetes cluster.local in-addr.arpa ip6.arpa {
|
kubernetes cluster.local in-addr.arpa ip6.arpa {
|
||||||
|
|||||||
Reference in New Issue
Block a user