diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 2c0c4a2..fea04d0 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -6,7 +6,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: golang:1.24 + container: registry.engen.priv.no/gitea-build:0.1.0 steps: - name: Setup SSH run: | diff --git a/.gitea/workflows/kobuild.yaml b/.gitea/workflows/kobuild.yaml index ca93197..f69ed40 100644 --- a/.gitea/workflows/kobuild.yaml +++ b/.gitea/workflows/kobuild.yaml @@ -6,7 +6,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: golang:1.24 + container: registry.engen.priv.no/gitea-build:0.1.0 env: GITEA_USER: ${{ secrets.GITEAUSER }} GITEA_TOKEN: ${{ secrets.GITEATOKEN }} @@ -19,14 +19,10 @@ jobs: echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa ssh-keyscan gitea-ssh.engen.priv.no >> ~/.ssh/known_hosts - - name: Install node and dockwr.io - run: apt update && apt -y install nodejs docker.io - name: Check out repository code uses: actions/checkout@v4 - name: ssh repo run: git config --global url.git@gitea-ssh.engen.priv.no:.insteadOf https://gitea.engen.priv.no/ - - name: Install ko - run: go install github.com/google/ko@latest - name: Docker login run: echo "${GITEA_TOKEN}" | docker login "${GITEA_REGISTRY}" --username "${GITEA_USER}" --password-stdin - name: Build diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 351b702..37ddb01 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -8,15 +8,13 @@ on: jobs: build: runs-on: ubuntu-latest - container: golang:1.24-bookworm + container: registry.engen.priv.no/gitea-build:0.1.0 env: GITEA_USER: ${{ secrets.GITEAUSER }} GITEA_TOKEN: ${{ secrets.GITEATOKEN }} GITEA_REGISTRY: gitea.engen.priv.no GITEA_ORG: klauvsteinen steps: - - name: Install dependencies - run: apt update && apt -y install nodejs bash docker.io - name: Setup SSH run: | mkdir -p ~/.ssh @@ -27,8 +25,6 @@ jobs: uses: actions/checkout@v4 - name: ssh repo run: git config --global url.git@gitea-ssh.engen.priv.no:.insteadOf https://gitea.engen.priv.no/ - - name: Install ko - run: go install github.com/google/ko@latest - name: Extract tag (outside container) shell: bash run: |