refactor: make things tidier

This commit is contained in:
Daniel Wolf 2024-03-29 12:07:30 -04:00
parent 0e58dfd8cf
commit be54636761
Signed by: nephatrine
GPG Key ID: 59D70EC2E4AAB4D0
2 changed files with 4 additions and 29 deletions

View File

@ -25,11 +25,6 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login (Pull Auth)
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -89,11 +84,6 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login (Pull Auth)
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -153,11 +143,6 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login (Pull Auth)
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -217,11 +202,6 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login (Pull Auth)
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -281,11 +261,6 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login (Pull Auth)
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''

View File

@ -9,16 +9,16 @@ RUN git -C /root clone -b "$ACT_RUNNER_VERSION" --single-branch --depth=1 https:
WORKDIR /root/act_runner
ARG TAGS="sqlite sqlite_unlock_notify cgo"
RUN echo "====== COMPILE ACT_RUNNER ======" \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) build
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) build
# ------------------------------
# hadolint ignore=DL3007
FROM code.nephatrine.net/nephnet/alpine-s6:latest
LABEL maintainer="Daniel Wolf <nephatrine@gmail.com>"
# hadolint ignore=DL3018
RUN echo "====== INSTALL PACKAGES ======" \
&& apk add --no-cache curl docker git git-lfs jq npm
RUN apk add --no-cache curl docker git git-lfs jq npm
COPY --from=builder /root/act_runner/act_runner /usr/bin/
COPY override /